[Fedora-directory-commits] ldapserver internal_comp_deps.mk, 1.24.2.1, 1.24.2.2

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24010

Modified Files:
      Tag: Directory71RtmBranch
	internal_comp_deps.mk 
Log Message:
[183717] Admin Server - wrong ELF class 
Package 32-bit LDAP C SDK libraries for the Admin Server.



Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- internal_comp_deps.mk	15 Feb 2006 21:32:16 -0000	1.24.2.1
+++ internal_comp_deps.mk	3 Mar 2006 19:06:22 -0000	1.24.2.2
@@ -132,6 +132,12 @@
 # do not need redundant copy of nssckbi
   NSS32_NSPR32_SRC_LIBS = $(filter-out $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE),$(wildcard $(SHARED32_BUILD_DIR)/lib/*))
   PACKAGE_SRC_DEST += $(addsuffix $(SPACE)shared32/lib,$(NSS32_NSPR32_SRC_LIBS))
+
+ifdef BUILD_PATCH
+# need 32-bit LDAP C SDK libs for SP2
+  LDAPSDK32_IMPORT = $(subst $(NS64TAG),,$(LDAP_RELEASE))
+  LDAPSDK32_PULLFILES = lib/$(LIB_PREFIX)$(subst $(SPACE),$(COMMA)lib/$(LIB_PREFIX),$(addsuffix .$(DLL_SUFFIX),$(LDAP_SOLIB_NAMES)))
+endif # BUILD_PATCH
 endif # USE_64
 
 ifdef VSFTPD_HACK
@@ -168,7 +174,12 @@
 	$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
 		-objdir $(SHARED32_BUILD_DIR) -componentdir $(NSS32_IMPORT) \
 		-files $(subst $(SPACE),$(COMMA),$(NSS32_PULLFILES))
-	mv $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI_FILE) $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE)
+ifdef BUILD_PATCH
+	$(FTP_PULL) -method $(LDAPSDK_PULL_METHOD) \
+		-objdir $(SHARED32_BUILD_DIR) -componentdir $(LDAPSDK32_IMPORT) \
+		-files $(subst $(SPACE),$(COMMA),$(LDAPSDK32_PULLFILES))
+endif
+	mv -f $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI_FILE) $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE)
 endif # USE_64
 endif # COMPONENT_DEPS
 	- at if [ ! -f $@ ] ; \