Author: justin Date: 2005-11-27 22:10:58 -0700 (Sun, 27 Nov 2005) New Revision: 1173
Modified: branches/dm/packages/openssl/Makefile branches/dm/packages/pkgconfig/Makefile branches/utf8-newmake/packages/openssl/Makefile branches/utf8-newmake/packages/pkgconfig/Makefile Log: Merged r1171 (upgraded pkg-config and openssl) from trunk to dm and utf8-newmake. Modified: branches/dm/packages/openssl/Makefile =================================================================== --- branches/dm/packages/openssl/Makefile 2005-11-28 05:08:52 UTC (rev 1172) +++ branches/dm/packages/openssl/Makefile 2005-11-28 05:10:58 UTC (rev 1173) @@ -1,18 +1,18 @@ # OpenSSL Makefile NM= openssl -VRS= 0.9.7h +VRS= 0.9.7i DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) -SHA-$(FILE)= 97f947f60b8da7076109344cfddaad77804708dd +SHA-$(FILE)= e5237c09aa46359e811f82002c8cead49b44b2ed PATCH1= $(DIR)-fix_manpages-1.patch URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1) SHA-$(PATCH1)= 7640f69ecbe701fd4b71e0d0329d9fffbcc52607 -PATCH40= $(DIR)-allow_lib64-1.patch +PATCH40= $(NM)-0.9.7h-allow_lib64-1.patch URL-$(PATCH40)= http://linuxfromscratch.org/~thomasp/x86_64-livecd/$(PATCH40) SHA-$(PATCH40)= 26ce4198986c9c46b8ae2c85918f831f550cee88 @@ -35,10 +35,6 @@ compile-stage2: for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; done $(CONFIG) --openssldir=/etc/ssl --prefix=/usr $(SSL_TARGET) shared -ifeq ($(LFS-ARCH),x86) - sed -i 's/mcpu=pentium/mtune=i486/' Configure - sed -i 's/mcpu=pentium/mtune=i486/' Makefile -endif make $(PM) $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man make $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man install cp -r certs /etc/ssl Modified: branches/dm/packages/pkgconfig/Makefile =================================================================== --- branches/dm/packages/pkgconfig/Makefile 2005-11-28 05:08:52 UTC (rev 1172) +++ branches/dm/packages/pkgconfig/Makefile 2005-11-28 05:10:58 UTC (rev 1173) @@ -1,12 +1,12 @@ # Pkgconfig Makefile NM= pkg-config -VRS= 0.19 +VRS= 0.20 DIR= $(NM)-$(VRS) -FILE= $(DIR).tar.gz -URL-$(FILE)= http://pkgconfig.freedesktop.org/releases/$(FILE) -SHA-$(FILE)= b09fa43dcc44fe0db8df1c4994a8ff9eab371666 +FILE= $(DIR).tar.bz2 +URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) +SHA-$(FILE)= 1e1368a2e00e81012aafa22d06cf15a520db81cd # Targets Modified: branches/utf8-newmake/packages/openssl/Makefile =================================================================== --- branches/utf8-newmake/packages/openssl/Makefile 2005-11-28 05:08:52 UTC (rev 1172) +++ branches/utf8-newmake/packages/openssl/Makefile 2005-11-28 05:10:58 UTC (rev 1173) @@ -1,18 +1,18 @@ # OpenSSL Makefile NM= openssl -VRS= 0.9.7h +VRS= 0.9.7i DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) -SHA-$(FILE)= 97f947f60b8da7076109344cfddaad77804708dd +SHA-$(FILE)= e5237c09aa46359e811f82002c8cead49b44b2ed PATCH1= $(DIR)-fix_manpages-1.patch URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1) SHA-$(PATCH1)= 7640f69ecbe701fd4b71e0d0329d9fffbcc52607 -PATCH40= $(DIR)-allow_lib64-1.patch +PATCH40= $(NM)-0.9.7h-allow_lib64-1.patch URL-$(PATCH40)= http://linuxfromscratch.org/~thomasp/x86_64-livecd/$(PATCH40) SHA-$(PATCH40)= 26ce4198986c9c46b8ae2c85918f831f550cee88 @@ -35,10 +35,6 @@ compile-stage2: for PATCH in $(PATCHES) ; do patch -Np1 -i ../$$PATCH ; done $(CONFIG) --openssldir=/etc/ssl --prefix=/usr $(SSL_TARGET) shared -ifeq ($(LFS-ARCH),x86) - sed -i 's/mcpu=pentium/mtune=i486/' Configure - sed -i 's/mcpu=pentium/mtune=i486/' Makefile -endif make $(PM) $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man make $(LIBDIR_OVERRIDE) MANDIR=/usr/share/man install cp -r certs /etc/ssl Modified: branches/utf8-newmake/packages/pkgconfig/Makefile =================================================================== --- branches/utf8-newmake/packages/pkgconfig/Makefile 2005-11-28 05:08:52 UTC (rev 1172) +++ branches/utf8-newmake/packages/pkgconfig/Makefile 2005-11-28 05:10:58 UTC (rev 1173) @@ -1,12 +1,12 @@ # Pkgconfig Makefile NM= pkg-config -VRS= 0.19 +VRS= 0.20 DIR= $(NM)-$(VRS) -FILE= $(DIR).tar.gz -URL-$(FILE)= http://pkgconfig.freedesktop.org/releases/$(FILE) -SHA-$(FILE)= b09fa43dcc44fe0db8df1c4994a8ff9eab371666 +FILE= $(DIR).tar.bz2 +URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE) +SHA-$(FILE)= 1e1368a2e00e81012aafa22d06cf15a520db81cd # Targets -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
