diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-06-24 14:46:48 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-06-24 14:46:48 +0000 |
| commit | bd08086f89b2b9ae4784008e274b3c500aaef93b (patch) | |
| tree | 1da0b0079d13bf52b659a264b6b3f74ff5f041da /sci-libs/ogdi/files | |
| parent | Mask app-editors/xxe for removal. (diff) | |
| download | gentoo-2-bd08086f89b2b9ae4784008e274b3c500aaef93b.tar.gz gentoo-2-bd08086f89b2b9ae4784008e274b3c500aaef93b.tar.bz2 gentoo-2-bd08086f89b2b9ae4784008e274b3c500aaef93b.zip | |
Version Bump, hopefully fixing bug 264724
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/ogdi/files')
| -rw-r--r-- | sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch | 38 | ||||
| -rw-r--r-- | sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch | 13 |
2 files changed, 51 insertions, 0 deletions
diff --git a/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch b/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch new file mode 100644 index 000000000000..f6fbc85e5ae9 --- /dev/null +++ b/sci-libs/ogdi/files/ogdi-3.1.6-fpic.patch @@ -0,0 +1,38 @@ +diff --git a/config/generic.mak.in b/config/generic.mak.in +index 1cb74f5..2e9cabe 100644 +--- a/config/generic.mak.in ++++ b/config/generic.mak.in +@@ -35,16 +35,16 @@ AR = ar cr + # Compilation and linking flags + # + SHLIB_CFLAGS = @C_PIC@ +-COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 ++COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@ + +-SHLIB_LDFLAGS = -shared +-COMMON_LDFLAGS = $(OPTIMIZATION) ++SHLIB_LDFLAGS = -shared -Wl,-soname,$(LIB_PREFIX)$(TOBEGEN).$(SHLIB_EXT).$(OGDI_MAJOR) ++COMMON_LDFLAGS = $(OPTIMIZATION) $(LDFLAGS) + + RPC_INCLUDES = @RPC_INCLUDES@ + + UCB_STATICLIB = + +-TCL_INCLUDE = -I/usr/include/tcl8.3 ++TCL_INCLUDE = -I${prefix}/include + TCL_LINKLIB = + + # +diff --git a/config/unix.mak b/config/unix.mak +index e3af578..927b0fc 100644 +--- a/config/unix.mak ++++ b/config/unix.mak +@@ -55,7 +55,7 @@ LINK_SW = -L + ifeq ($(CFG),debug) + OPTIMIZATION = -g + else +-OPTIMIZATION = -O ++OPTIMIZATION = + endif + + # diff --git a/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch b/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch new file mode 100644 index 000000000000..df96ddfeda76 --- /dev/null +++ b/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch @@ -0,0 +1,13 @@ +diff --git a/makefile b/makefile +index 8c62a03..3ecb0f0 100644 +--- a/makefile ++++ b/makefile +@@ -17,7 +17,7 @@ include $(TOPDIR)/config/common.mak + # + # Sub-directories that need to be built + # +-subdirs = external vpflib ogdi contrib ++subdirs = vpflib ogdi contrib + + ifneq ($(PROJ_SETTING),external) + subdirs := proj $(subdirs) |