diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-05-05 16:17:48 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-05-05 16:17:48 +0000 |
| commit | a3e6ed1c40905eb231207a706fb4dd8e600703d4 (patch) | |
| tree | f8df8bdc31b0e3464b3a70cb5475cb7a239f28c4 /sci-libs/neartree/files | |
| parent | Restrict Jython ABIs. (diff) | |
| download | gentoo-2-a3e6ed1c40905eb231207a706fb4dd8e600703d4.tar.gz gentoo-2-a3e6ed1c40905eb231207a706fb4dd8e600703d4.tar.bz2 gentoo-2-a3e6ed1c40905eb231207a706fb4dd8e600703d4.zip | |
Version Bump, notified by euscan
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/neartree/files')
| -rw-r--r-- | sci-libs/neartree/files/2.3.2-gentoo.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/sci-libs/neartree/files/2.3.2-gentoo.patch b/sci-libs/neartree/files/2.3.2-gentoo.patch new file mode 100644 index 000000000000..4ddf55f7526b --- /dev/null +++ b/sci-libs/neartree/files/2.3.2-gentoo.patch @@ -0,0 +1,82 @@ + Makefile | 28 ++++++++++++++-------------- + 1 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/Makefile b/Makefile +index 2a5c626..0698510 100644 +--- a/Makefile ++++ b/Makefile +@@ -50,11 +50,11 @@ RELEASE = 2.3.2 + # + # Compiler and compilation flags + # +-CC = gcc ++CC ?= gcc + ifneq ($(MSYSTEM),MINGW32) +-CFLAGS = -g -O2 -Wall -ansi -pedantic -DCNEARTREE_SAFE_TRIANG=1 ++CFLAGS += -ansi -DCNEARTREE_SAFE_TRIANG=1 + else +-CFLAGS = -g -O2 -Wall -DCNEARTREE_SAFE_TRIANG=1 ++CFLAGS += -DCNEARTREE_SAFE_TRIANG=1 + endif + + # +@@ -74,8 +74,8 @@ endif + # Uncomment the next two lines if CVector is installed locally in $(HOME)/include + # and $(HOME)/lib + # +-#CVECTOR_INCLUDE = -I$(HOME)/include +-#CVECTOR_LIBLOC = -L$(HOME)/lib ++CVECTOR_INCLUDE = -I/usr/include ++CVECTOR_LIBLOC = -L/usr/GENTOOLIBDIR + + # + # Directories +@@ -88,7 +88,7 @@ INC = $(ROOT) + EXAMPLES = $(ROOT) + TESTDATA = $(ROOT) + ifndef INSTALL_PREFIX +-INSTALL_PREFIX = /usr/local ++INSTALL_PREFIX = $(DESTDIR)/usr + #INSTALL_PREFIX = $(HOME) + endif + +@@ -113,10 +113,10 @@ CPPLIBRARIES = -lm + CLIBRARIES = $(CVECTOR_LIBLOC) -lCVector -lm + + COMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c +-CPPCOMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c +-LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib ++CPPCOMPILE_COMMAND = $(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) $(INCLUDES) $(WARNINGS) -c ++LIBRARY_LINK_COMMAND = $(LIBTOOL) --mode=link $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/GENTOOLIBDIR $(LDFLAGS) + BUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES) +-CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CFLAGS) $(INCLUDES) ++CPPBUILD_COMMAND_LOCAL = $(LIBTOOL) --mode=link $(CXX) -no-undefined $(CXXFLAGS) $(INCLUDES) + BUILD_COMMAND_DYNAMIC = $(LIBTOOL) --mode=link $(CC) -no-undefined $(CFLAGS) -shared -I$(INSTALL_PREFIX)/include + BUILD_COMMAND_STATIC = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static-libtool-libs -I$(INSTALL_PREFIX)/include + INSTALL_COMMAND = $(LIBTOOL) --mode=install cp +@@ -223,11 +223,11 @@ all: $(LIB) $(BIN) $(SOURCE) $(HEADERS) \ + $(LIB)/libCNearTree.$(LIB_EXT) \ + $(BIN)/CPPMain $(BIN)/CMain $(BIN)/CPPNearTreeTest $(BIN)/CNearTreeTest + +-install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include \ ++install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/GENTOOLIBDIR $(INSTALL_PREFIX)/include \ + $(INC) $(LIB)/libCNearTree.$(LIB_EXT) $(INC)/TNear.h $(INC)/CNearTree.h \ + $(INC)/rhrand.h $(INC)/triple.h +- $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT) +- $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/lib/libCNearTree.$(LIB_EXT) ++ $(INSTALL_COMMAND) $(LIB)/libCNearTree.$(LIB_EXT) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT) ++ $(INSTALL_FINISH_COMMAND) $(INSTALL_PREFIX)/GENTOOLIBDIR/libCNearTree.$(LIB_EXT) + -cp $(INSTALL_PREFIX)/include/TNear.h $(INSTALL_PREFIX)/include/TNear_old.h + -cp $(INSTALL_PREFIX)/include/CNearTree.h $(INSTALL_PREFIX)/include/CNearTree_old.h + cp $(INC)/TNear.h $(INSTALL_PREFIX)/include/TNear.h +@@ -255,8 +255,8 @@ install: all $(INSTALL_PREFIX) $(INSTALL_PREFIX)/lib $(INSTALL_PREFIX)/include + $(INSTALL_PREFIX): + mkdir -p $(INSTALL_PREFIX) + +-$(INSTALL_PREFIX)/lib: $(INSTALL_PREFIX) +- mkdir -p $(INSTALL_PREFIX)/lib ++$(INSTALL_PREFIX)/GENTOOLIBDIR: $(INSTALL_PREFIX) ++ mkdir -p $(INSTALL_PREFIX)/GENTOOLIBDIR + + $(INSTALL_PREFIX)/bin: $(INSTALL_PREFIX) + mkdir -p $(INSTALL_PREFIX)/bin |