| 1 |
jlec 11/05/05 16:17:48 |
| 2 |
|
| 3 |
Added: 2.3.2-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/neartree/files/2.3.2-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/neartree/files/2.3.2-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/neartree/files/2.3.2-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 2.3.2-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
Makefile | 28 ++++++++++++++-------------- |
| 18 |
1 files changed, 14 insertions(+), 14 deletions(-) |
| 19 |
|
| 20 |
diff --git a/Makefile b/Makefile |
| 21 |
index 2a5c626..0698510 100644 |
| 22 |
--- a/Makefile |
| 23 |
+++ b/Makefile |
| 24 |
@@ -50,11 +50,11 @@ RELEASE = 2.3.2 |
| 25 |
# |
| 26 |
# Compiler and compilation flags |
| 27 |
# |
| 28 |
-CC = gcc |
| 29 |
+CC ?= gcc |
| 30 |
ifneq ($(MSYSTEM),MINGW32) |
| 31 |
-CFLAGS = -g -O2 -Wall -ansi -pedantic -DCNEARTREE_SAFE_TRIANG=1 |
| 32 |
+CFLAGS += -ansi -DCNEARTREE_SAFE_TRIANG=1 |
| 33 |
else |
| 34 |
-CFLAGS = -g -O2 -Wall -DCNEARTREE_SAFE_TRIANG=1 |
| 35 |
+CFLAGS += -DCNEARTREE_SAFE_TRIANG=1 |
| 36 |
endif |
| 37 |
|
| 38 |
# |
| 39 |
@@ -74,8 +74,8 @@ endif |
| 40 |
# Uncomment the next two lines if CVector is installed locally in $(HOME)/include |
| 41 |
# and $(HOME)/lib |
| 42 |
# |
| 43 |
-#CVECTOR_INCLUDE = -I$(HOME)/include |
| 44 |
-#CVECTOR_LIBLOC = -L$(HOME)/lib |
| 45 |
+CVECTOR_INCLUDE = -I/usr/include |
| 46 |
+CVECTOR_LIBLOC = -L/usr/GENTOOLIBDIR |
| 47 |
|
| 48 |
# |
| 49 |
# Directories |
| 50 |
@@ -88,7 +88,7 @@ INC = $(ROOT) |
| 51 |
EXAMPLES = $(ROOT) |
| 52 |
TESTDATA = $(ROOT) |
| 53 |
ifndef INSTALL_PREFIX |
| 54 |
-INSTALL_PREFIX = /usr/local |
| 55 |
+INSTALL_PREFIX = $(DESTDIR)/usr |
| 56 |
#INSTALL_PREFIX = $(HOME) |
| 57 |
endif |
| 58 |
|
| 59 |
@@ -113,10 +113,10 @@ CPPLIBRARIES = -lm |
| 60 |
CLIBRARIES = $(CVECTOR_LIBLOC) -lCVector -lm |
| 61 |
|
| 62 |
COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c |
| 63 |
-CPPCOMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c |
| 64 |
-LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib |
| 65 |
+CPPCOMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) $(INCLUDES) $(WARNINGS) -c |
| 66 |
+LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/GENTOOLIBDIR $(LDFLAGS) |
| 67 |
BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES) |
| 68 |
-CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CFLAGS) $(INCLUDES) |
| 69 |
+CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CXXFLAGS) $(INCLUDES) |
| 70 |
BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -shared -I$(INSTALL_PREFIX)/include |
| 71 |
BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static-libtool-libs -I$(INSTALL_PREFIX)/include |
| 72 |
INSTALL_COMMAND = $(LIBTOOL) --mode=install cp |
| 73 |
@@ -223,11 +223,11 @@ all: $(LIB) $(BIN) $(SOURCE) $(HEADERS) \ |
| 74 |
$(LIB)/libCNearTree.$(LIB_EXT) \ |
| 75 |
$(BIN)/CPPMain $(BIN)/CMain $(BIN)/CPPNearTreeTest $(BIN)/CNearTreeTest |
| 76 |
|
| 77 |
-install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include \ |
| 78 |
+install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/GENTOOLIBDIR $(INSTALL_PREFIX)/include \ |
| 79 |
$(INC) $(LIB)/libCNearTree.$(LIB_EXT) $(INC)/TNear.h $(INC)/CNearTree.h \ |
| 80 |
$(INC)/rhrand.h $(INC)/triple.h |
| 81 |
- $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT) |
| 82 |
- $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT) |
| 83 |
+ $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT) |
| 84 |
+ $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT) |
| 85 |
-cp $(INSTALL_PREFIX)/include/TNear.h $(INSTALL_PREFIX)/include/TNear_old.h |
| 86 |
-cp $(INSTALL_PREFIX)/include/CNearTree.h $(INSTALL_PREFIX)/include/CNearTree_old.h |
| 87 |
cp $(INC)/TNear.h $(INSTALL_PREFIX)/include/TNear.h |
| 88 |
@@ -255,8 +255,8 @@ install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include |
| 89 |
$(INSTALL_PREFIX): |
| 90 |
mkdir -p $(INSTALL_PREFIX) |
| 91 |
|
| 92 |
-$(INSTALL_PREFIX)/lib: $(INSTALL_PREFIX) |
| 93 |
- mkdir -p $(INSTALL_PREFIX)/lib |
| 94 |
+$(INSTALL_PREFIX)/GENTOOLIBDIR: $(INSTALL_PREFIX) |
| 95 |
+ mkdir -p $(INSTALL_PREFIX)/GENTOOLIBDIR |
| 96 |
|
| 97 |
$(INSTALL_PREFIX)/bin: $(INSTALL_PREFIX) |
| 98 |
mkdir -p $(INSTALL_PREFIX)/bin |
Archives