From 512f1a382b4df45cfe90e609aef7bcf25b8f2e11 Mon Sep 17 00:00:00 2001 From: deadwood Date: Fri, 17 Oct 2025 09:31:43 +0200 Subject: [PATCH] Disabled usergroup.library and netinfo.device Interface needs a review before making it public, for example utmp.h contains long variables, which have different size between 32-bit and 64-bit. --- workbench/devs/netinfo/mmakefile.src | 10 +++++----- workbench/libs/mmakefile | 1 - workbench/libs/usergroup/mmakefile.src | 14 +++++++------- workbench/network/common/C/mmakefile.src | 20 ++++++++++---------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/workbench/devs/netinfo/mmakefile.src b/workbench/devs/netinfo/mmakefile.src index 01d48b158e..54279c1089 100644 --- a/workbench/devs/netinfo/mmakefile.src +++ b/workbench/devs/netinfo/mmakefile.src @@ -17,11 +17,11 @@ FILES := \ #USER_CPPFLAGS := -DDEBUG=1 USER_LDFLAGS := -static -%build_module mmake=workbench-devs-netinfo \ - modname=netinfo modtype=device \ - files=$(FILES) +#%build_module mmake=workbench-devs-netinfo \ +# modname=netinfo modtype=device \ +# files=$(FILES) -INCLUDE_FILES = include/netinfo.h -%copy_includes path=devices dir=include +#INCLUDE_FILES = include/netinfo.h +#%copy_includes path=devices dir=include %common diff --git a/workbench/libs/mmakefile b/workbench/libs/mmakefile index 830b1f0a3c..b943500b53 100644 --- a/workbench/libs/mmakefile +++ b/workbench/libs/mmakefile @@ -48,7 +48,6 @@ include $(SRCDIR)/config/aros.cfg #MM workbench-libs-rexxsyslib \ #MM workbench-libs-realtime \ #MM workbench-libs-tiff \ -#MM workbench-libs-usergroup \ #MM workbench-libs-vega \ #MM workbench-libs-version \ #MM workbench-libs-workbench \ diff --git a/workbench/libs/usergroup/mmakefile.src b/workbench/libs/usergroup/mmakefile.src index ca3f1a3171..5c9272010a 100644 --- a/workbench/libs/usergroup/mmakefile.src +++ b/workbench/libs/usergroup/mmakefile.src @@ -26,14 +26,14 @@ USER_LDFLAGS := -static #MM workbench-libs-usergroup : includes linklibs %subtarget parentmmake=workbench-libs mmake=workbench-libs-usergroup -%build_module mmake=workbench-libs-usergroup modname=usergroup \ - modtype=library files="$(FILES)" \ - uselibs="" +#%build_module mmake=workbench-libs-usergroup modname=usergroup \ +# modtype=library files="$(FILES)" \ +# uselibs="" -INCLUDE_FILES:=usergroup.h -%copy_includes path=libraries includes=$(INCLUDE_FILES) +#INCLUDE_FILES:=usergroup.h +#%copy_includes path=libraries includes=$(INCLUDE_FILES) -INCLUDE_FILES:=utmp.h -%copy_includes includes=$(INCLUDE_FILES) +#INCLUDE_FILES:=utmp.h +#%copy_includes includes=$(INCLUDE_FILES) %common diff --git a/workbench/network/common/C/mmakefile.src b/workbench/network/common/C/mmakefile.src index 6ca442fdb3..cb0484199f 100644 --- a/workbench/network/common/C/mmakefile.src +++ b/workbench/network/common/C/mmakefile.src @@ -13,11 +13,11 @@ USER_CPPFLAGS := \ #MM- workbench-network-common-c : \ #MM workbench-network-common-c-base \ #MM workbench-network-common-c-miami \ -#MM workbench-network-common-c-usergroup +##MM workbench-network-common-c-usergroup #MM- workbench-network-common-c-quick : \ #MM workbench-network-common-c-base-quick \ #MM workbench-network-common-c-miami-quick \ -#MM workbench-network-common-c-usergroup-quick +##MM workbench-network-common-c-usergroup-quick #MM workbench-network-common-c-base : \ #MM network-includes \ @@ -26,11 +26,11 @@ USER_CPPFLAGS := \ #MM network-includes \ #MM arostcp-linklibs-netlib \ #MM arostcp-linklibs-miami -#MM workbench-network-common-c-usergroup : \ -#MM network-includes \ -#MM workbench-libs-usergroup-includes \ -#MM arostcp-linklibs-netlib \ -#MM arostcp-linklibs-miami +##MM workbench-network-common-c-usergroup : \ +##MM network-includes \ +##MM workbench-libs-usergroup-includes \ +##MM arostcp-linklibs-netlib \ +##MM arostcp-linklibs-miami BASEFILES := \ arp \ @@ -54,9 +54,9 @@ USERGROUPFILES := \ files="$(MIAMIFILES)" \ targetdir=$(AROS_C) uselibs="miami net" usesdks="config network" -%build_progs mmake=workbench-network-common-c-usergroup \ - files="$(USERGROUPFILES)" \ - targetdir=$(AROS_C) uselibs="miami net" usesdks="network" +#%build_progs mmake=workbench-network-common-c-usergroup \ +# files="$(USERGROUPFILES)" \ +# targetdir=$(AROS_C) uselibs="miami net" usesdks="network" #%common