[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.17, 1.30.2.18 fedora-patch.inf, 1.1.2.10, 1.1.2.11 redhat-patch.inf, 1.1.2.10, 1.1.2.11
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Tue Mar 7 00:52:16 UTC 2006
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19602
Modified Files:
Tag: Directory71RtmBranch
Makefile fedora-patch.inf redhat-patch.inf
Log Message:
[183717] Admin Server - wrong ELF class
Should have treated the 32-bit build and 64-bit in the different way:
32-bit -- copy from dist/<platform>/<component> (e.g., dist/SunOS5.9_OPT.OBJ/ldapsdk)
64-bit -- copy from dist/<platform>/shared32 (e.g., dist/SunOS5.9_64_OPT.OBJ/shared32)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.17
retrieving revision 1.30.2.18
diff -u -r1.30.2.17 -r1.30.2.18
--- Makefile 3 Mar 2006 19:06:50 -0000 1.30.2.17
+++ Makefile 7 Mar 2006 00:52:08 -0000 1.30.2.18
@@ -233,6 +233,14 @@
ifdef BUILD_PATCH
PATCHINSTDIR = $(ABS_INSTDIR)-SP
SLAPDSP = slapd-71sp2
+PATCH_DISTDIR=$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)
+ifeq ($(USE_64), 1)
+ PATCH_DISTDIR32=$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)\/shared32
+ PATCH_LDAPSDK=
+else
+ PATCH_DISTDIR32=$(PATCH_DISTDIR)
+ PATCH_LDAPSDK=ldapsdk
+endif
endif
INST_TARGET_RESKIT=$(INSTDIR)/reskit
@@ -714,16 +722,18 @@
ifdef BUILD_PATCH
# take care of files in components (e.g., a file in nsadmin.zip)
+ @echo compfile...
- at for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
- zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR32%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)\/shared32/" | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
+ zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR32%/$(PATCH_DISTDIR32)/" | sed -e "s/%DISTDIR%/$(PATCH_DISTDIR)/"` ; \
afile=`echo $$pair | awk -F: '{print $$2}'` ; \
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
done
# copying files from the component area
+ @echo copyfile...
- at for pair in `grep "^copyfile:" $(PATCHINF) | awk '{print $$3}'`; do \
zipfile=`echo $$pair | awk -F: '{print $$1}'` ; \
- sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR32%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)\/shared32/" | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
+ sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR32%/$(PATCH_DISTDIR32)/" | sed -e "s/%LDAPSDK%/$(PATCH_LDAPSDK)/" | sed -e "s/%DISTDIR%/$(PATCH_DISTDIR)/"` ; \
dfile=`echo $$pair | awk -F: '{print $$3}'` ; \
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); \
mkdir -p `dirname $$dfile`; cp $$sfile `dirname $$dfile` ; \
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- fedora-patch.inf 3 Mar 2006 19:06:50 -0000 1.1.2.10
+++ fedora-patch.inf 7 Mar 2006 00:52:08 -0000 1.1.2.11
@@ -41,7 +41,10 @@
# file: bug#: <patchfile>
# compfile: bug#: <patch_zipfile>:<patchfile>
# %DISTDIR% points <buildroot>/dist/<platform>
+# 64bit:
# %DISTDIR32% points <buildroot>/dist/<platform>/shared32
+# 32it:
+# %DISTDIR32% points <buildroot>/dist/<platform>
#
base: ...
@@ -76,11 +79,11 @@
file: M324525,M324529: clients/lib/libprldap50.*
file: M324525,M324529: clients/lib/libssldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libldap50.*:bin/https/lib/libldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libprldap50.*:bin/https/lib/libprldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libssldap50.*:bin/https/lib/libssldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libldap50.*:bin/admin/lib/libldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libprldap50.*:bin/admin/lib/libprldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libssldap50.*:bin/admin/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libldap50.*:bin/https/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libprldap50.*:bin/https/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libssldap50.*:bin/https/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libldap50.*:bin/admin/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libprldap50.*:bin/admin/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libssldap50.*:bin/admin/lib/libssldap50.*
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- redhat-patch.inf 3 Mar 2006 19:06:50 -0000 1.1.2.10
+++ redhat-patch.inf 7 Mar 2006 00:52:08 -0000 1.1.2.11
@@ -41,7 +41,10 @@
# file: bug#: <patchfile>
# compfile: bug#: <patch_zipfile>:<patchfile>
# %DISTDIR% points <buildroot>/dist/<platform>
+# 64bit:
# %DISTDIR32% points <buildroot>/dist/<platform>/shared32
+# 32it:
+# %DISTDIR32% points <buildroot>/dist/<platform>
#
base: /share/builds/products/server/directry/7.1
@@ -76,11 +79,11 @@
file: M324525,M324529: clients/lib/libprldap50.*
file: M324525,M324529: clients/lib/libssldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libldap50.*:bin/https/lib/libldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libprldap50.*:bin/https/lib/libprldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libssldap50.*:bin/https/lib/libssldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libldap50.*:bin/admin/lib/libldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libprldap50.*:bin/admin/lib/libprldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libssldap50.*:bin/admin/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libldap50.*:bin/https/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libprldap50.*:bin/https/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libssldap50.*:bin/https/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libldap50.*:bin/admin/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libprldap50.*:bin/admin/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libssldap50.*:bin/admin/lib/libssldap50.*
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
More information about the Fedora-directory-commits
mailing list