[45435] trunk/dports/archivers/bzip2/files/patch-Makefile-dylib.diff

ryandesign at macports.org ryandesign at macports.org
Thu Jan 15 21:11:51 PST 2009


Revision: 45435
          http://trac.macports.org/changeset/45435
Author:   ryandesign at macports.org
Date:     2009-01-15 21:11:50 -0800 (Thu, 15 Jan 2009)
Log Message:
-----------
bzip2: reinstate "DYLD_LIBRARY_PATH=." patch which was removed without explanation in r21525 which enables bzip2 to properly find the just-built libraries before they're installed even if another (possibly incompatible) copy of the libraries is available elsewhere.

Modified Paths:
--------------
    trunk/dports/archivers/bzip2/files/patch-Makefile-dylib.diff

Modified: trunk/dports/archivers/bzip2/files/patch-Makefile-dylib.diff
===================================================================
--- trunk/dports/archivers/bzip2/files/patch-Makefile-dylib.diff	2009-01-16 02:52:41 UTC (rev 45434)
+++ trunk/dports/archivers/bzip2/files/patch-Makefile-dylib.diff	2009-01-16 05:11:50 UTC (rev 45435)
@@ -1,5 +1,5 @@
---- Makefile.orig	2007-01-03 04:49:21.000000000 +0100
-+++ Makefile	2007-01-27 01:21:15.000000000 +0100
+--- Makefile.orig	2008-02-14 06:39:18.000000000 -0600
++++ Makefile	2009-01-15 22:53:35.000000000 -0600
 @@ -35,7 +35,7 @@
        decompress.o \
        bzlib.o
@@ -9,7 +9,7 @@
  
  bzip2: libbz2.a bzip2.o
  	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
-@@ -52,6 +52,15 @@
+@@ -52,15 +52,24 @@
  		$(RANLIB) libbz2.a ; \
  	fi
  
@@ -25,6 +25,21 @@
  check: test
  test: bzip2
  	@cat words1
+-	./bzip2 -1  < sample1.ref > sample1.rb2
+-	./bzip2 -2  < sample2.ref > sample2.rb2
+-	./bzip2 -3  < sample3.ref > sample3.rb2
+-	./bzip2 -d  < sample1.bz2 > sample1.tst
+-	./bzip2 -d  < sample2.bz2 > sample2.tst
+-	./bzip2 -ds < sample3.bz2 > sample3.tst
++	DYLD_LIBRARY_PATH=. ./bzip2 -1  < sample1.ref > sample1.rb2
++	DYLD_LIBRARY_PATH=. ./bzip2 -2  < sample2.ref > sample2.rb2
++	DYLD_LIBRARY_PATH=. ./bzip2 -3  < sample3.ref > sample3.rb2
++	DYLD_LIBRARY_PATH=. ./bzip2 -d  < sample1.bz2 > sample1.tst
++	DYLD_LIBRARY_PATH=. ./bzip2 -d  < sample2.bz2 > sample2.tst
++	DYLD_LIBRARY_PATH=. ./bzip2 -ds < sample3.bz2 > sample3.tst
+ 	cmp sample1.bz2 sample1.rb2 
+ 	cmp sample2.bz2 sample2.rb2
+ 	cmp sample3.bz2 sample3.rb2
 @@ -89,6 +98,11 @@
  	chmod a+r $(PREFIX)/include/bzlib.h
  	cp -f libbz2.a $(PREFIX)/lib
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090115/d39994b4/attachment-0001.html>


More information about the macports-changes mailing list