diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2005-05-10 23:17:04 +0000 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2005-05-10 23:17:04 +0000 |
| commit | b03fcfc5fb3fa876b7ef4be45d90868b8f6e6def (patch) | |
| tree | e082ba7d6108634404e6702994eab622cf4ca39e /ldap | |
| parent | b95f9a9277761ecdd25b48314efd1e3797dc3b13 (diff) | |
| download | ds-b03fcfc5fb3fa876b7ef4be45d90868b8f6e6def.tar.gz ds-b03fcfc5fb3fa876b7ef4be45d90868b8f6e6def.tar.xz ds-b03fcfc5fb3fa876b7ef4be45d90868b8f6e6def.zip | |
Changes so DS can be built with gcc on Solaris.
Pass these build variables to gmake: NO_MDUPDATE=1 NS_USE_GCC=1
Diffstat (limited to 'ldap')
| -rw-r--r-- | ldap/nsldap.mk | 8 | ||||
| -rw-r--r-- | ldap/servers/slapd/libmakefile | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ldap/nsldap.mk b/ldap/nsldap.mk index e3ad1286..6e681f70 100644 --- a/ldap/nsldap.mk +++ b/ldap/nsldap.mk @@ -955,8 +955,10 @@ PLATFORM=sunos5 # ranlib not needed under SunOS5 RANLIB = true +ifdef NS_USE_NATIVE # be explicit about which CC to use CC=cc -v +endif # gie full path to hostname since it may not be in user's path HOSTNAME=/usr/ucb/hostname @@ -966,7 +968,11 @@ INSTALL=$(LDAP_SRC)/build/install.sh # Flags required to cause compiler to generate code suitable for use in # a shared library. +ifdef NS_USE_NATIVE SLCFLAGS= -KPIC +else +SLCFLAGS= -fPIC +endif # Extra linker options needed when creating shared libraries DYNALIBS= @@ -981,7 +987,9 @@ LDRPATHFLAG_PREFIX=-R # flag to pass to ld to set a shared library's "internal name" # this is used like this, for example: $(SONAMEFLAG_PREFIX)libldap.so +ifdef NS_USE_NATIVE SONAMEFLAG_PREFIX=-h +endif THREADS= -DTHREAD_SUNOS5_LWP PLAT_ADMCFLAGS= -DSVR4 -DSOLARIS diff --git a/ldap/servers/slapd/libmakefile b/ldap/servers/slapd/libmakefile index fdc70aeb..e1f6945b 100644 --- a/ldap/servers/slapd/libmakefile +++ b/ldap/servers/slapd/libmakefile @@ -149,10 +149,15 @@ endif ifeq ($(ARCH), SOLARIS) LINK_DLL += -z defs # removed -lcx from the following line -EXTRA_LIBS += -lCstd -lCrun -lm -lw -lc +EXTRA_LIBS += -lm -lw -lc +ifdef NS_USE_NATIVE +EXTRA_LIBS += -lCstd -lCrun +endif # with the Forte 6 and later compilers, we must use CC to link +ifdef NS_USE_NATIVE LD=CC endif +endif #ifeq ($(ARCH), OSF1) #DLL_LDFLAGS=-shared -all -error_unresolved -taso -ySVRCORE_RegisterPinObj |