[Libreoffice-commits] core.git: external/libgpg-error

[Stephan Bergmann]

 external/libgpg-error/UnpackedTarball_libgpg-error.mk |    1 -
 external/libgpg-error/disable-rpath-option.patch      |   13 -------------
 2 files changed, 14 deletions(-)

New commits:
commit 4cb1f0a5ff1c3e74c650f17d9a164e97c34e9327
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 8 14:31:50 2018 +0100

    Remove apparently unused external/libgpg-error/disable-rpath-option.patch
    
    ...which only patched configure.ac not configure, and the latter does not appear
    to be regenerated from the former in ExternalProject_libgpg-error
    
    Change-Id: Id0132ed8fd8ea3a5012e4a2bc309bd5f3983ad11
    Reviewed-on: https://gerrit.libreoffice.org/50954
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index cdf656e13554..ad2145a96aa7 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libgpg-error,$(LIBGPGERROR_TARBALL)
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libgpg-error,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
-    external/libgpg-error/disable-rpath-option.patch \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-3.patch.1) \
diff --git a/external/libgpg-error/disable-rpath-option.patch b/external/libgpg-error/disable-rpath-option.patch
deleted file mode 100644
index b039b689e9ed..000000000000
--- a/external/libgpg-error/disable-rpath-option.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur libgpg-error.org/configure.ac libgpg-error/configure.ac
---- configure.ac	2017-03-05 01:27:38.249210887 +0100
-+++ configure.ac~	2017-03-05 01:29:36.820894687 +0100
-@@ -404,6 +404,9 @@
-    CFLAGS="$CFLAGS -fvisibility=hidden"
- fi
- 
-+# permit disabling rpath
-+AC_LIB_RPATH
-+
- #
- # Check whether ld supports a version script.
- # (Actually not a check but a list of systems which are known to support it.)