commit: 546e660c873c48791c2ab2eb1fe9c28a63621e5e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Oct 21 17:52:49 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Nov 2 12:05:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=546e660c
dev-db/postgis: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-db/postgis/files/postgis-2.2.0-arflags.patch | 18 -----
.../postgis-3.0.3-avoid-calling-ar-directly.patch | 85 ----------------------
.../files/postgis-3.0.3-detect-only-stdc.patch | 17 -----
3 files changed, 120 deletions(-)
diff --git a/dev-db/postgis/files/postgis-2.2.0-arflags.patch
b/dev-db/postgis/files/postgis-2.2.0-arflags.patch
deleted file mode 100644
index 97770042d8f6..000000000000
--- a/dev-db/postgis/files/postgis-2.2.0-arflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naruw a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
---- a/raster/rt_core/Makefile.in 2015-05-13 14:13:18.000000000 -0400
-+++ b/raster/rt_core/Makefile.in 2015-12-14 16:49:49.166156232 -0500
-@@ -18,7 +18,7 @@
- #
- #############################################################################
-
--AR = ar rs
-+ARFLAGS = rs
-
- CC = @CC@
- LIBLWGEOM_LDFLAGS = ../../liblwgeom/.libs/liblwgeom.a
-@@ -64,4 +64,4 @@
- rm -f Makefile
-
- librtcore.a: $(RT_OBJS)
-- $(AR) $(RT_LIB) $(RT_OBJS)
-+ $(AR) $(ARFLAGS) $(RT_LIB) $(RT_OBJS)
diff --git a/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch
b/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch
deleted file mode 100644
index 66a82e1e7261..000000000000
--- a/dev-db/postgis/files/postgis-3.0.3-avoid-calling-ar-directly.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 7c5acb8ab83ee278f6a16c7279c3a12ca93499e9 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <wae...@gmail.com>
-Date: Sat, 5 Dec 2020 13:38:03 +0100
-Subject: [PATCH] avoid calling ar directly
-
-Signed-off-by: Bernd Waibel <wae...@gmail.com>
----
- configure.ac | 2 +-
- deps/wagyu/Makefile.in | 4 +++-
- libpgcommon/Makefile.in | 4 +++-
- raster/rt_core/Makefile.in | 1 +
- 4 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f26390..362d3e6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,7 +14,7 @@ AC_CONFIG_HEADERS([postgis_config.h])
- AC_CONFIG_MACRO_DIR([macros])
- AC_CONFIG_AUX_DIR([build-aux])
- AC_PROG_INSTALL
--
-+AM_PROG_AR
-
- dnl Invoke libtool: we do this as it is the easiest way to find the PIC
- dnl flags required to build liblwgeom
-diff --git a/deps/wagyu/Makefile.in b/deps/wagyu/Makefile.in
-index 03d2279..05d6629 100644
---- a/deps/wagyu/Makefile.in
-+++ b/deps/wagyu/Makefile.in
-@@ -28,6 +28,8 @@ LDFLAGS = @LDFLAGS@
- top_builddir = @top_builddir@
- libdir = @libdir@
- LIBTOOL = @LIBTOOL@
-+AR = @AR@
-+ARFLAGS = rs
-
- WAGYU_OBJS = \
- lwgeom_wagyu.o
-@@ -78,7 +80,7 @@ WAGYU_HEADERS = \
- all: @WAGYU_LIB@
-
- @WAGYU_LIB@: $(WAGYU_OBJS)
-- ar rs @WAGYU_LIB@ $(WAGYU_OBJS)
-+ $(AR) $(ARFLAGS) @WAGYU_LIB@ $(WAGYU_OBJS)
-
- $(WAGYU_OBJS): %.o: %.cpp ../../liblwgeom/liblwgeom.h $(WAGYU_HEADERS)
- $(CXX) $(CXXFLAGS) -c -o $@ $<
-diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
-index c44cf5b..78eb282 100644
---- a/libpgcommon/Makefile.in
-+++ b/libpgcommon/Makefile.in
-@@ -12,6 +12,8 @@
- CC=@CC@
- CFLAGS=-I../liblwgeom @WARNFLAGS@ @CFLAGS@ @PGSQL_BE_CPPFLAGS@
@PROJ_CPPFLAGS@ @PICFLAGS@ @GETTEXT_CFLAGS@
- LDFLAGS=@GETTEXT_LDFLAGS@ @LIBINTL@
-+AR = @AR@
-+ARFLAGS = rs
-
- NUMERICFLAGS=@NUMERICFLAGS@
-
-@@ -39,7 +41,7 @@ all: libpgcommon.a
- install uninstall:
-
- libpgcommon.a: $(SA_OBJS) $(SA_HEADERS)
-- ar rs libpgcommon.a $(SA_OBJS)
-+ $(AR) $(ARFLAGS) libpgcommon.a $(SA_OBJS)
-
- maintainer-clean: clean
-
-diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
-index 380a3e7..b399661 100644
---- a/raster/rt_core/Makefile.in
-+++ b/raster/rt_core/Makefile.in
-@@ -18,6 +18,7 @@
- #
- #############################################################################
-
-+AR = @AR@
- ARFLAGS = rs
-
- CC = @CC@
---
-2.29.2
-
diff --git a/dev-db/postgis/files/postgis-3.0.3-detect-only-stdc.patch
b/dev-db/postgis/files/postgis-3.0.3-detect-only-stdc.patch
deleted file mode 100644
index 5b97102bb236..000000000000
--- a/dev-db/postgis/files/postgis-3.0.3-detect-only-stdc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naruw postgis-3.1.0.orig/configure.ac postgis-3.1.0/configure.ac
---- postgis-3.1.0.orig/configure.ac 2020-12-18 14:39:26.000000000 -0500
-+++ postgis-3.1.0/configure.ac 2020-12-19 07:35:13.232167083 -0500
-@@ -1501,12 +1501,9 @@
- dnl ============================================================
- CC="$WAGYU_CXX"
-
-- AC_CHECK_LIB(c++, main, [HAVE_CPP=yes], [HAVE_CPP=no])
- AC_CHECK_LIB(stdc++, main, [HAVE_STDCPP=yes], [HAVE_STDCPP=no])
-
-- if test "x$HAVE_CPP" = "xyes"; then
-- WAGYU_LDFLAGS="-lc++"
-- elif test "x$HAVE_STDCPP" = "xyes"; then
-+ if test "x$HAVE_STDCPP" = "xyes"; then
- WAGYU_LDFLAGS="-lstdc++"
- else
- AC_MSG_WARN("Could not find a C++ standard library")
