summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2017-01-29 10:13:48 +0100
committerDavid Seifert <soap@gentoo.org>2017-01-29 21:09:39 +0100
commitf59566aa9bf56d44d6d2e1c50ea52e3ea623dbbb (patch)
tree58b5d8747fb37a46b3aa0c86d8b24f6253ae049d
parentsci-libs/netcdf: remove unused patches (diff)
downloadgentoo-f59566aa9bf56d44d6d2e1c50ea52e3ea623dbbb.tar.gz
gentoo-f59566aa9bf56d44d6d2e1c50ea52e3ea623dbbb.tar.bz2
gentoo-f59566aa9bf56d44d6d2e1c50ea52e3ea623dbbb.zip
sci-libs/ogdi: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3709
-rw-r--r--sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch177
-rw-r--r--sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch13
2 files changed, 0 insertions, 190 deletions
diff --git a/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch b/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch
deleted file mode 100644
index 33fb56103193..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.1.4-fpic.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-Only in ogdi-3.1.5.orig: bin
-Only in ogdi-3.1.5.orig/config: Linux.mak
-Only in ogdi-3.1.5.orig: config.cache
-Only in ogdi-3.1.5.orig: config.log
-Only in ogdi-3.1.5.orig: config.status
-Only in ogdi-3.1.5.orig/external/expat: OBJ.Linux
-diff -ur ogdi-3.1.5/external/expat/makefile ogdi-3.1.5.orig/external/expat/makefile
---- ogdi-3.1.5/external/expat/makefile 2001-08-27 14:11:10.000000000 +0000
-+++ ogdi-3.1.5.orig/external/expat/makefile 2005-08-01 18:57:49.020052368 +0000
-@@ -36,7 +36,7 @@
- # Compilation flags
- #
- INCLUDES = $(CURRENT_INCLUDE)
--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) \
-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC \
- -DVERSION=\"expat_1.95.1\" -DPACKAGE="expat"
-
- ifeq ($(BIG_ENDIAN),1)
-Only in ogdi-3.1.5.orig/external/zlib: OBJ.Linux
-diff -ur ogdi-3.1.5/external/zlib/makefile ogdi-3.1.5.orig/external/zlib/makefile
---- ogdi-3.1.5/external/zlib/makefile 2001-04-19 05:26:46.000000000 +0000
-+++ ogdi-3.1.5.orig/external/zlib/makefile 2005-08-01 18:58:47.984088472 +0000
-@@ -46,7 +46,7 @@
- # Compilation flags
- #
- INCLUDES = $(CURRENT_INCLUDE)
--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
-
- #
- # Primary target
-Only in ogdi-3.1.5.orig/lib: Linux
-Only in ogdi-3.1.5.orig/ogdi/c-api: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/c-api/makefile ogdi-3.1.5.orig/ogdi/c-api/makefile
---- ogdi-3.1.5/ogdi/c-api/makefile 2001-04-19 05:29:31.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/c-api/makefile 2005-08-01 18:53:51.936094608 +0000
-@@ -23,7 +23,7 @@
- $(GRASS_INCLUDE) $(ZLIB_INCLUDE) $(PROJ_INCLUDE) \
- $(EXPAT_INCLUDE)
-
--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
-
- LINK_LIBS= $(RPC_LINKLIB) $(ZLIB_LINKLIB) $(EXPAT_LINKLIB) $(WIN_LINKLIB) \
- $(PROJ_STATICLIB) $(MATH_LINKLIB)
-Only in ogdi-3.1.5.orig/ogdi/datum_driver/canada: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/datum_driver/canada/makefile ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile
---- ogdi-3.1.5/ogdi/datum_driver/canada/makefile 2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/datum_driver/canada/makefile 2005-08-01 19:03:00.932634448 +0000
-@@ -17,7 +17,7 @@
- SOURCES = nadconv.c dtcanada.c
-
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
-
- LINK_LIBS=
-
-Only in ogdi-3.1.5.orig/ogdi/datum_driver/usa: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/datum_driver/usa/makefile ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile
---- ogdi-3.1.5/ogdi/datum_driver/usa/makefile 2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/datum_driver/usa/makefile 2005-08-01 19:03:24.883993288 +0000
-@@ -17,7 +17,7 @@
- SOURCES = dtusa.c
-
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
-
- LINK_LIBS= $(PROJ_STATICLIB)
-
-Only in ogdi-3.1.5.orig/ogdi/driver/adrg: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/adrg/makefile ogdi-3.1.5.orig/ogdi/driver/adrg/makefile
---- ogdi-3.1.5/ogdi/driver/adrg/makefile 2001-06-22 16:37:50.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/adrg/makefile 2005-08-01 19:06:07.422283712 +0000
-@@ -18,7 +18,7 @@
-
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
-
--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
-
- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB)
-
-Only in ogdi-3.1.5.orig/ogdi/driver/dted: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/dted/makefile ogdi-3.1.5.orig/ogdi/driver/dted/makefile
---- ogdi-3.1.5/ogdi/driver/dted/makefile 2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/dted/makefile 2005-08-01 19:06:31.460629328 +0000
-@@ -17,7 +17,7 @@
- SOURCES = dted.c utils.c object.c
-
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE)
--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
-
- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB)
-
-Only in ogdi-3.1.5.orig/ogdi/driver/network: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/network/makefile ogdi-3.1.5.orig/ogdi/driver/network/makefile
---- ogdi-3.1.5/ogdi/driver/network/makefile 2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/network/makefile 2005-08-01 19:06:52.242470008 +0000
-@@ -17,7 +17,7 @@
- SOURCES = remote.c ecs_clnt.c
-
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GRASS_INCLUDE) $(PROJ_INCLUDE)
--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
-
- LINK_LIBS= $(OGDI_LINKLIB) $(RPC_LINKLIB) $(WIN_LINKLIB)
-
-Only in ogdi-3.1.5.orig/ogdi/driver/rpf: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/rpf/makefile ogdi-3.1.5.orig/ogdi/driver/rpf/makefile
---- ogdi-3.1.5/ogdi/driver/rpf/makefile 2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/rpf/makefile 2005-08-01 19:07:39.956216416 +0000
-@@ -19,7 +19,7 @@
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) \
- $(GRASS_INCLUDE) $(PROJ_INCLUDE)
-
--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
-
- LINK_LIBS= $(OGDI_LINKLIB) $(VPF_STATICLIB) $(GLUTIL_STATICLIB) $(WIN_LINKLIB) $(MATH_LINKLIB)
-
-Only in ogdi-3.1.5.orig/ogdi/driver/skeleton: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/skeleton/makefile ogdi-3.1.5.orig/ogdi/driver/skeleton/makefile
---- ogdi-3.1.5/ogdi/driver/skeleton/makefile 2001-02-19 04:12:21.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/skeleton/makefile 2005-08-01 19:07:15.500934184 +0000
-@@ -18,7 +18,7 @@
-
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(GLUTIL_INCLUDE) $(PROJ_INCLUDE)
-
--CFLAGS = $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS)
-+CFLAGS = $(INCLUDES) $(MACHINE) $(COMMON_CFLAGS) -fPIC -DPIC
-
- LINK_LIBS= $(OGDI_LINKLIB) $(GLUTIL_STATICLIB)
-
-Only in ogdi-3.1.5.orig/ogdi/driver/vrf: OBJ.Linux
-diff -ur ogdi-3.1.5/ogdi/driver/vrf/makefile ogdi-3.1.5.orig/ogdi/driver/vrf/makefile
---- ogdi-3.1.5/ogdi/driver/vrf/makefile 2001-06-20 21:49:31.000000000 +0000
-+++ ogdi-3.1.5.orig/ogdi/driver/vrf/makefile 2005-08-01 19:08:03.541630888 +0000
-@@ -17,7 +17,7 @@
- SOURCES = vrf.c utils.c feature.c object.c open.c swq.c vrfswq.c
-
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(OGDI_INCLUDE) $(VPF_INCLUDE) $(PROJ_INCLUDE) $(GLUTIL_INCLUDE)
--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
-
- LINK_LIBS= $(OGDI_LINKLIB) $(WIN_LINKLIB) $(VPF_STATICLIB) $(MATH_LINKLIB)
-
-Only in ogdi-3.1.5.orig/ogdi/gltpd: OBJ.Linux
-Only in ogdi-3.1.5.orig/ogdi/glutil: OBJ.Linux
-Only in ogdi-3.1.5.orig/proj: OBJ.Linux
-diff -ur ogdi-3.1.5/proj/makefile ogdi-3.1.5.orig/proj/makefile
---- ogdi-3.1.5/proj/makefile 2001-04-09 16:20:08.000000000 +0000
-+++ ogdi-3.1.5.orig/proj/makefile 2005-08-01 19:01:03.573475752 +0000
-@@ -42,7 +42,7 @@
-
- INCLUDES = $(CURRENT_INCLUDE)
-
--CFLAGS = $(INCLUDES) $(COMMON_CFLAGS)
-+CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) -fPIC -DPIC
-
- include $(TOPDIR)/config/common.mak
-
-Only in ogdi-3.1.5.orig/vpflib: OBJ.Linux
-diff -ur ogdi-3.1.5/vpflib/makefile ogdi-3.1.5.orig/vpflib/makefile
---- ogdi-3.1.5/vpflib/makefile 2001-02-20 04:25:20.000000000 +0000
-+++ ogdi-3.1.5.orig/vpflib/makefile 2005-08-01 19:09:48.072739744 +0000
-@@ -31,7 +31,7 @@
- INCLUDES = $(CURRENT_INCLUDE) $(GENERAL_INCLUDE) $(VPF_INCLUDE)
-
- CFLAGS = $(INCLUDES) $(COMMON_CFLAGS) $(UNIX_DEFINE) \
-- -DSYS_BIG_ENDIAN=$(BIG_ENDIAN)
-+ -DSYS_BIG_ENDIAN=$(BIG_ENDIAN) -fPIC -DPIC
-
- include $(TOPDIR)/config/common.mak
-
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
deleted file mode 100644
index df96ddfeda76..000000000000
--- a/sci-libs/ogdi/files/ogdi-3.1.6-unbundle-libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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)