[gentoo-commits] gentoo-x86 commit in app-portage/deltup/files: deltup-0.4.4-asneeded.patch bzip2-1.0.2-makefile-CFLAGS.patch deltup-0.4.4-CFLAGS.patch bzip2-1.0.3-makefile-CFLAGS.patch

[Victor Ostorga (vostorga)]

vostorga    09/08/02 15:42:25

  Modified:             bzip2-1.0.2-makefile-CFLAGS.patch
  Added:                deltup-0.4.4-asneeded.patch
                        deltup-0.4.4-CFLAGS.patch
                        bzip2-1.0.3-makefile-CFLAGS.patch
  Log:
  Respecting CFLAGS and LDFLAGS, fixing build with --as-needed. Patch thanks to Zeev Tarantov, bugs #240121 #246916 #246189
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.2                  app-portage/deltup/files/bzip2-1.0.2-makefile-CFLAGS.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/deltup/files/bzip2-1.0.2-makefile-CFLAGS.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/deltup/files/bzip2-1.0.2-makefile-CFLAGS.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/deltup/files/bzip2-1.0.2-makefile-CFLAGS.patch?r1=1.1&r2=1.2

Index: bzip2-1.0.2-makefile-CFLAGS.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/deltup/files/bzip2-1.0.2-makefile-CFLAGS.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzip2-1.0.2-makefile-CFLAGS.patch	28 Apr 2005 10:03:18 -0000	1.1
+++ bzip2-1.0.2-makefile-CFLAGS.patch	2 Aug 2009 15:42:25 -0000	1.2
@@ -1,6 +1,13 @@
---- Makefile.orig	2004-12-26 16:30:06.354116536 -0500
-+++ Makefile	2004-12-26 16:32:13.617769520 -0500
-@@ -9,7 +9,7 @@
+diff -NrU5 bzip2-1.0.2.original/Makefile bzip2-1.0.2/Makefile
+--- bzip2-1.0.2.original/Makefile	2002-01-25 17:34:53.000000000 -0600
++++ bzip2-1.0.2/Makefile	2009-08-02 13:26:37.000000000 -0600
+@@ -3,15 +3,14 @@
+ 
+ # To assist in cross-compiling
+ CC=gcc
+ AR=ar
+ RANLIB=ranlib
+-LDFLAGS=
  
  # Suitably paranoid flags to avoid bugs in gcc-2.7
  BIGFILES=-D_FILE_OFFSET_BITS=64
@@ -9,14 +16,94 @@
  
  # Where you want it installed when you do 'make install'
  PREFIX=/usr
---- Makefile-libbz2_so.orig	2004-12-26 16:32:23.972195408 -0500
-+++ Makefile-libbz2_so	2004-12-26 16:32:34.835543928 -0500
-@@ -9,7 +9,7 @@
+ 
+ 
+@@ -102,27 +101,27 @@
+ 	sample1.rb2 sample2.rb2 sample3.rb2 \
+ 	sample1.tst sample2.tst sample3.tst
+ 
+ blocksort.o: blocksort.c
+ 	@cat words0
+-	$(CC) $(CFLAGS) -c blocksort.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c blocksort.c
+ huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c huffman.c
+ crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c crctable.c
+ randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c randtable.c
+ compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c compress.c
+ decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c decompress.c
+ bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c bzlib.c
+ bzip2.o: bzip2.c
+-	$(CC) $(CFLAGS) -c bzip2.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c bzip2.c
+ bzip2recover.o: bzip2recover.c
+-	$(CC) $(CFLAGS) -c bzip2recover.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c bzip2recover.c
+ 
+ DISTNAME=bzip2-1.0.2
+ tarfile:
+ 	rm -f $(DISTNAME)
+ 	ln -sf . $(DISTNAME)
+diff -NrU5 bzip2-1.0.2.original/Makefile-libbz2_so bzip2-1.0.2/Makefile-libbz2_so
+--- bzip2-1.0.2.original/Makefile-libbz2_so	2001-12-29 20:15:59.000000000 -0600
++++ bzip2-1.0.2/Makefile-libbz2_so	2009-08-02 13:11:24.000000000 -0600
+@@ -7,38 +7,38 @@
+ # important info about building the library like this.
+ 
  SHELL=/bin/sh
  CC=gcc
  BIGFILES=-D_FILE_OFFSET_BITS=64
 -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
-+CFLAGS+=-fpic -fPIC -Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
++CFLAGS+=-fpic -fPIC -Wall -Winline -fno-strength-reduce $(BIGFILES)
  
  OBJS= blocksort.o  \
        huffman.o    \
+       crctable.o   \
+       randtable.o  \
+       compress.o   \
+       decompress.o \
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.2 $(OBJS)
+-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.2
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.2 $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.2
+ 	rm -f libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.2 libbz2.so.1.0
+ 
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.2 libbz2.so.1.0 bzip2-shared
+ 
+ blocksort.o: blocksort.c
+-	$(CC) $(CFLAGS) -c blocksort.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c blocksort.c
+ huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c huffman.c
+ crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c crctable.c
+ randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c randtable.c
+ compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c compress.c
+ decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c decompress.c
+ bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c bzlib.c



1.1                  app-portage/deltup/files/deltup-0.4.4-asneeded.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/deltup/files/deltup-0.4.4-asneeded.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/deltup/files/deltup-0.4.4-asneeded.patch?rev=1.1&content-type=text/plain

Index: deltup-0.4.4-asneeded.patch
===================================================================
diff -NrU5 deltup-0.4.4.original/Makefile deltup-0.4.4/Makefile
--- deltup-0.4.4.original/Makefile	2009-08-02 15:38:27.000000000 -0600
+++ deltup-0.4.4/Makefile	2009-08-02 15:38:37.000000000 -0600
@@ -3,11 +3,11 @@
 BINDIR=$(PREFIX)/bin
 
 CXX = g++
 
 objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o 
-libs=-lstdc++ -lz -lbz2 -lssl
+libs=-lstdc++ -lz -lbz2 -lcrypto
 
 #edelta: edelta.cpp deltup
 #	gcc edelta.cpp ${CXXFLAGS} -o edelta
 %.o : %.cpp
 	$(CXX) $(CFLAGS) $(LDFLAGS) -c $< -o $@ -g #-Wall -pedantic #-DFIXED_FRAMERATE



1.1                  app-portage/deltup/files/deltup-0.4.4-CFLAGS.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/deltup/files/deltup-0.4.4-CFLAGS.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/deltup/files/deltup-0.4.4-CFLAGS.patch?rev=1.1&content-type=text/plain

Index: deltup-0.4.4-CFLAGS.patch
===================================================================
diff -NrU5 deltup-0.4.4.original/Makefile deltup-0.4.4/Makefile
--- deltup-0.4.4.original/Makefile	2009-08-02 13:41:03.000000000 -0600
+++ deltup-0.4.4/Makefile	2009-08-02 15:29:10.000000000 -0600
@@ -1,26 +1,26 @@
 DESTDIR=
 PREFIX=/usr
 BINDIR=$(PREFIX)/bin
 
-CC = g++
+CXX = g++
 
 objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o 
 libs=-lstdc++ -lz -lbz2 -lssl
 
 #edelta: edelta.cpp deltup
 #	gcc edelta.cpp ${CXXFLAGS} -o edelta
 %.o : %.cpp
-	${CC} -c $< -o $@ -g #-Wall -pedantic #-DFIXED_FRAMERATE
+	$(CXX) $(CFLAGS) $(LDFLAGS) -c $< -o $@ -g #-Wall -pedantic #-DFIXED_FRAMERATE
 
 all: deltup
 
 depend:
-	gcc -MM *.cpp > .depend
+	$(CXX) -MM *.cpp > .depend
 	
 deltup: $(objfiles)
-	${CC} $(objfiles) ${CXXFLAGS} -o deltup $(libs)
+	$(CXX) $(objfiles) $(CFLAGS) $(LDFLAGS) -o deltup $(libs)
 
 install: deltup
 	mkdir -p $(DESTDIR)$(BINDIR)
 	install -m 755 deltup $(DESTDIR)$(BINDIR)
 



1.1                  app-portage/deltup/files/bzip2-1.0.3-makefile-CFLAGS.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/deltup/files/bzip2-1.0.3-makefile-CFLAGS.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/deltup/files/bzip2-1.0.3-makefile-CFLAGS.patch?rev=1.1&content-type=text/plain

Index: bzip2-1.0.3-makefile-CFLAGS.patch
===================================================================
diff -NrU5 bzip2-1.0.3.original/Makefile bzip2-1.0.3/Makefile
--- bzip2-1.0.3.original/Makefile	2009-08-02 13:31:08.000000000 -0600
+++ bzip2-1.0.3/Makefile	2009-08-02 13:38:59.000000000 -0600
@@ -3,14 +3,14 @@
 
 # To assist in cross-compiling
 CC=gcc
 AR=ar
 RANLIB=ranlib
-LDFLAGS=
+#LDFLAGS=
 
 BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O -g $(BIGFILES)
+CFLAGS+=-Wall -Winline -O -g $(BIGFILES)
 
 # Where you want it installed when you do 'make install'
 PREFIX=/usr
 
 
@@ -100,27 +100,27 @@
 	sample1.rb2 sample2.rb2 sample3.rb2 \
 	sample1.tst sample2.tst sample3.tst
 
 blocksort.o: blocksort.c
 	@cat words0
-	$(CC) $(CFLAGS) -c blocksort.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -c blocksort.c
 huffman.o: huffman.c
-	$(CC) $(CFLAGS) -c huffman.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -c huffman.c
 crctable.o: crctable.c
-	$(CC) $(CFLAGS) -c crctable.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -c crctable.c
 randtable.o: randtable.c
-	$(CC) $(CFLAGS) -c randtable.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -c randtable.c
 compress.o: compress.c
-	$(CC) $(CFLAGS) -c compress.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -c compress.c
 decompress.o: decompress.c
-	$(CC) $(CFLAGS) -c decompress.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -c decompress.c
 bzlib.o: bzlib.c
-	$(CC) $(CFLAGS) -c bzlib.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -c bzlib.c
 bzip2.o: bzip2.c
-	$(CC) $(CFLAGS) -c bzip2.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -c bzip2.c
 bzip2recover.o: bzip2recover.c
-	$(CC) $(CFLAGS) -c bzip2recover.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -c bzip2recover.c
 
 
 distclean: clean
 	rm -f manual.ps manual.html manual.pdf