diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-08-29 17:10:33 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-09-20 11:37:46 -0400 |
| commit | de07d52142cd7c4906bac33a9fafc168ae2c1c15 (patch) | |
| tree | 7c34e3500d9faa1b1bd25824db384501a8182710 /usr/src | |
| parent | f231403a1619536a2003db8da7ce5d1cea5522ae (diff) | |
| download | illumos-joyent-de07d52142cd7c4906bac33a9fafc168ae2c1c15.tar.gz | |
14923 svccfg native build confused adjuncts (use 64-bit native svccfg)
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/svc/common/notify_params.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/svc/svccfg/Makefile | 11 | ||||
| -rw-r--r-- | usr/src/cmd/svc/svccfg/svccfg_libscf.c | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/usr/src/cmd/svc/common/notify_params.c b/usr/src/cmd/svc/common/notify_params.c index 16104d899e..73ea6ccc5a 100644 --- a/usr/src/cmd/svc/common/notify_params.c +++ b/usr/src/cmd/svc/common/notify_params.c @@ -287,7 +287,7 @@ listnotify_print(nvlist_t *nvl, const char *event) { char *fmri; nvlist_t **params; - size_t n; + uint_t n; int32_t tset; int i; diff --git a/usr/src/cmd/svc/svccfg/Makefile b/usr/src/cmd/svc/svccfg/Makefile index fb277942b9..d000d419cd 100644 --- a/usr/src/cmd/svc/svccfg/Makefile +++ b/usr/src/cmd/svc/svccfg/Makefile @@ -93,7 +93,8 @@ $(NOT_NATIVE)SVCCFG_EXTRA_LIBS += -ltecla # # If no adjunct, then we'll already find /usr/lib via LDLIBS below. # -NATIVE_LIBS += libxml2.so libl.so libumem.so libmd.so libnvpair.so libc.so +NATIVE_LIBS += libxml2.so libl.so libumem.so libmd.so libnvpair.so libc.so \ + libscf.so libuutil.so LIBSCF = $(SRC)/lib/libscf LIBTECLA = $(SRC)/lib/libtecla # just for the header @@ -101,10 +102,10 @@ LIBUUTIL = $(SRC)/lib/libuutil LDLIBS += $(SVCCFG_EXTRA_LIBS) -$(NATIVE_BUILD)NATIVE_LIBS += libl.so libumem.so libmd5.so libnvpair.so libc.so -$(NATIVE_BUILD)CC = $(NATIVECC) -$(NATIVE_BUILD)LD = $(NATIVELD) -$(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS) +$(NATIVE_BUILD)CC = $(NATIVECC64) +$(NATIVE_BUILD)LD = $(NATIVELD64) +# Add the -g debug flag in spite of being native so ctfconvert won't whine. +$(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS64) -g $(NATIVE_BUILD)CPPFLAGS = \ -DNATIVE_BUILD \ $(MYCPPFLAGS) \ diff --git a/usr/src/cmd/svc/svccfg/svccfg_libscf.c b/usr/src/cmd/svc/svccfg/svccfg_libscf.c index a1a3a44ad2..491040eca7 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_libscf.c +++ b/usr/src/cmd/svc/svccfg/svccfg_libscf.c @@ -12604,7 +12604,7 @@ lscf_service_delete(scf_service_t *svc, int force) static int delete_callback(void *data, scf_walkinfo_t *wip) { - int force = (int)data; + int force = (int)(intptr_t)data; if (wip->inst != NULL) (void) lscf_instance_delete(wip->inst, force); @@ -12684,7 +12684,7 @@ lscf_delete(const char *fmri, int force) * Match FMRI to entity. */ if ((ret = scf_walk_fmri(g_hndl, 1, (char **)&fmri, SCF_WALK_SERVICE, - delete_callback, (void *)force, NULL, semerr)) != 0) { + delete_callback, (void *)(intptr_t)force, NULL, semerr)) != 0) { semerr(gettext("Failed to walk instances: %s\n"), scf_strerror(ret)); } |