| 1 |
jlec 11/05/05 16:18:31 |
| 2 |
|
| 3 |
Added: 1.0.6-gentoo.patch |
| 4 |
Log: |
| 5 |
Version Bump, notified by euscan |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/cqrlib/files/1.0.6-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cqrlib/files/1.0.6-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cqrlib/files/1.0.6-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.0.6-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
Makefile | 54 ++++++++++++++++-------------------------------------- |
| 18 |
1 files changed, 16 insertions(+), 38 deletions(-) |
| 19 |
|
| 20 |
diff --git a/Makefile b/Makefile |
| 21 |
index 9590e50..7703c41 100644 |
| 22 |
--- a/Makefile |
| 23 |
+++ b/Makefile |
| 24 |
@@ -88,7 +88,7 @@ INCLUDES = -I$(INC) |
| 25 |
endif |
| 26 |
|
| 27 |
COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c |
| 28 |
-LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -rpath $(INSTALLDIR)/lib |
| 29 |
+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -shared -version-info $(VERSION) -rpath $(INSTALLDIR)/lib ${LDFLAGS} |
| 30 |
BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES) |
| 31 |
BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -dynamic -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib |
| 32 |
BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALLDIR)/include -L$(INSTALLDIR)/lib |
| 33 |
@@ -196,52 +196,30 @@ all: $(LIB) $(BIN) $(SOURCE) $(HEADERS) \ |
| 34 |
$(LIB)/libCQRlib.$(LIB_EXT) \ |
| 35 |
$(BIN)/CQRlibTest $(BIN)/CPPQRTest |
| 36 |
|
| 37 |
-install: all $(INSTALLDIR) $(INSTALLDIR)/lib $(INSTALLDIR)/include \ |
| 38 |
+install: all $(DESTDIR) $(DESTDIR)/GENTOOLIBDIR $(DESTDIR)/include \ |
| 39 |
$(INC) $(LIB)/libCQRlib.$(LIB_EXT) $(INC)/cqrlib.h |
| 40 |
- $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT) |
| 41 |
- $(INSTALL_FINISH_COMMAND) $(INSTALLDIR)/lib/libCQRlib.$(LIB_EXT) |
| 42 |
- -cp $(INSTALLDIR)/include/cqrlib.h $(INSTALLDIR)/include/CQRlib_old.h |
| 43 |
- cp $(INC)/cqrlib.h $(INSTALLDIR)/include/cqrlib.h |
| 44 |
- chmod 644 $(INSTALLDIR)/include/cqrlib.h |
| 45 |
- echo "Testing final install dynamic" |
| 46 |
- $(BUILD_COMMAND_DYNAMIC) $(EXAMPLES)/CQRlibTest.c \ |
| 47 |
- -lCQRlib -lm -o $(BIN)/CQRlibTest_dynamic |
| 48 |
- $(BIN)/CQRlibTest_dynamic > $(TESTDATA)/CQRlibTest_dynamic.lst |
| 49 |
- diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \ |
| 50 |
- $(TESTDATA)/CQRlibTest_dynamic.lst |
| 51 |
- echo "Testing final install static" |
| 52 |
- $(BUILD_COMMAND_STATIC) $(EXAMPLES)/CQRlibTest.c \ |
| 53 |
- -lCQRlib -lm -o $(BIN)/CQRlibTest_static |
| 54 |
- $(BIN)/CQRlibTest_static > $(TESTDATA)/CQRlibTest_static.lst |
| 55 |
- diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \ |
| 56 |
- $(TESTDATA)/CQRlibTest_static.lst |
| 57 |
- $(CPPBUILD_COMMAND_DYNAMIC) $(EXAMPLES)/CPPQRTest.cpp \ |
| 58 |
- -lm -o $(BIN)/CPPQRTest_dynamic |
| 59 |
- $(BIN)/CPPQRTest_dynamic > $(TESTDATA)/CPPQRTest_dynamic.lst |
| 60 |
- diff -b -c $(TESTDATA)/CPPQRTest_orig.lst \ |
| 61 |
- $(TESTDATA)/CPPQRTest_dynamic.lst |
| 62 |
- $(CPPBUILD_COMMAND_STATIC) $(EXAMPLES)/CPPQRTest.cpp \ |
| 63 |
- -lm -o $(BIN)/CPPQRTest_static |
| 64 |
- $(BIN)/CPPQRTest_static > $(TESTDATA)/CPPQRTest_static.lst |
| 65 |
- diff -b -c $(TESTDATA)/CPPQRTest_orig.lst \ |
| 66 |
- $(TESTDATA)/CPPQRTest_static.lst |
| 67 |
+ $(INSTALL_COMMAND) $(LIB)/libCQRlib.$(LIB_EXT) $(DESTDIR)/usr/GENTOOLIBDIR/libCQRlib.$(LIB_EXT) |
| 68 |
+ $(INSTALL_FINISH_COMMAND) $(DESTDIR)/usr/GENTOOLIBDIR/libCQRlib.$(LIB_EXT) |
| 69 |
+ -cp $(INSTALLDIR)/cqrlib.h $(DESTDIR)/usr/include/CQRlib.h |
| 70 |
+ cp $(INC)/cqrlib.h $(DESTDIR)/usr/include/cqrlib.h |
| 71 |
+ chmod 644 $(DESTDIR)/usr/include/cqrlib.h |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
# |
| 76 |
# Directories |
| 77 |
# |
| 78 |
-$(INSTALLDIR): |
| 79 |
- mkdir -p $(INSTALLDIR) |
| 80 |
+$(DESTDIR): |
| 81 |
+ mkdir -p $(DESTDIR) |
| 82 |
|
| 83 |
-$(INSTALLDIR)/lib: $(INSTALLDIR) |
| 84 |
- mkdir -p $(INSTALLDIR)/lib |
| 85 |
+$(DESTDIR)/GENTOOLIBDIR: $(DESTDIR) |
| 86 |
+ mkdir -p $(DESTDIR)/usr/GENTOOLIBDIR |
| 87 |
|
| 88 |
-$(INSTALLDIR)/bin: $(INSTALLDIR) |
| 89 |
- mkdir -p $(INSTALLDIR)/bin |
| 90 |
+$(DESTDIR)/bin: $(DESTDIR) |
| 91 |
+ mkdir -p $(DESTDIR)/usr/bin |
| 92 |
|
| 93 |
-$(INSTALLDIR)/include: $(INSTALLDIR) |
| 94 |
- mkdir -p $(INSTALLDIR)/include |
| 95 |
+$(DESTDIR)/include: $(DESTDIR) |
| 96 |
+ mkdir -p $(DESTDIR)/usr/include |
| 97 |
|
| 98 |
|
| 99 |
$(LIB): |
| 100 |
@@ -274,7 +252,7 @@ $(BIN)/CPPQRTest: $(EXAMPLES)/CPPQRTest.cpp |
| 101 |
# |
| 102 |
# Tests |
| 103 |
# |
| 104 |
-tests: $(LIB) $(BIN) $(BIN)/CQRlibTest \ |
| 105 |
+tests: $(LIB) $(BIN) $(BIN)/CQRlibTest $(BIN)/CPPQRTest \ |
| 106 |
all $(TESTDATA)/CQRlibTest_orig.lst $(TESTDATA)/CPPQRTest_orig.lst |
| 107 |
$(BIN)/CQRlibTest > $(TESTDATA)/CQRlibTest.lst |
| 108 |
diff -b -c $(TESTDATA)/CQRlibTest_orig.lst \ |
Archives