[Fedora-directory-commits] dsbuild/ds/mozilla Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Tue Feb 14 22:29:36 UTC 2006
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/mozilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/mozilla
Modified Files:
Makefile checksums
Log Message:
upgrade to 1.0.2
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1
+++ Makefile 14 Feb 2006 22:29:29 -0000 1.2
@@ -3,8 +3,9 @@
CATEGORIES = ds
# have the regular download rule download the patch rather than listing it in PATCHFILES
# this is so we can override the default patch rule
-MYPATCH = mozilla-gcc4.patch
-DISTFILES = mozilla-components-2.tar.gz $(MYPATCH)
+#MYPATCH = mozilla-gcc4.patch
+MYPATCH = sysfdtable.patch sysfdtable2.patch
+DISTFILES = mozilla-components-1.0.2.tar.gz $(MYPATCH)
PATCHFILES =
LIBDEPS =
@@ -16,7 +17,7 @@
INSTALL_SCRIPTS = custom
ifndef DEBUG
-OPTFLAG="BUILDOPT=1"
+OPTFLAG="BUILD_OPT=1"
CONFIGFLAG=--disable-debug --enable-optimize
else
CONFIGFLAG=--enable-debug --disable-optimize
@@ -24,22 +25,25 @@
# this is our "custom" patch target
post-patch:
+ifdef MYPATCH
cat $(addprefix download/,$(MYPATCH)) | ( cd work ; patch -p0 )
+endif
$(MAKECOOKIE)
configure-custom:
# remove the stupid mozilla- directory
rmdir $(WORKSRC)
- cd work/mozilla/directory/c-sdk && ./configure --with-nss $(CONFIGFLAG)
$(MAKECOOKIE)
build-custom:
cd work/mozilla/security/nss && $(MAKE) nss_build_all $(OPTFLAG)
cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG)
+ cd work/mozilla/directory/c-sdk && ./configure --with-svrcore $(CONFIGFLAG)
cd work/mozilla/directory/c-sdk && $(MAKE) BUILDCLU=1 HAVE_SVRCORE=1 $(OPTFLAG)
# perldap uses MakeMaker, so lots of env. vars.
cd work/mozilla/directory/perldap && \
- LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=`echo ../../dist/*.OBJ` perl Makefile.PL && $(MAKE)
+ LDAPSDKDIR=/opt/mozldap LDAPSDKSSL=yes NSPRDIR=`echo ../../dist/*.OBJ` perl Makefile.PL && \
+ $(MAKE) LD_RUN_PATH=/opt/fedora-ds/shared/lib
$(MAKECOOKIE)
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mozilla/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1
+++ checksums 14 Feb 2006 22:29:29 -0000 1.2
@@ -1,3 +1,6 @@
b93ea453da4e0510130649cf827108b1 download/mozilla-components.tar.gz
39bca53b30595c69fc64a6710dd3129e download/mozilla-components-2.tar.gz
a4c0724bc5b319ec7670da4cce93f920 download/mozilla-gcc4.patch
+f0d13d53c37adfe5312cf44d5d992042 download/sysfdtable.patch
+251df4db04cced3c22713c865289d471 download/sysfdtable2.patch
+931bc65330ad6d53aeb951e9d51a6a53 download/mozilla-components-1.0.2.tar.gz
More information about the Fedora-directory-commits
mailing list