Remove obsolete patch for RPATH

3 files changed, 4 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b71a54712b2b..b564494baefb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnatcoll-iconv-git
 	pkgdesc = GNAT Components Collection - Bindings to Libiconv
-	pkgver = r2776.4ff02cdf
+	pkgver = r2777.2c426fe7
 	pkgrel = 1
 	url = https://github.com/AdaCore/gnatcoll-bindings/
 	arch = i686
@@ -15,9 +15,7 @@ pkgbase = gnatcoll-iconv-git
 	conflicts = gnatcoll-iconv
 	conflicts = gnatcoll
 	source = git+https://github.com/AdaCore/gnatcoll-bindings.git
-	source = no-rpath.patch
 	sha1sums = SKIP
-	sha1sums = aaf6f2b07f9c594413479ba1f884366f4c122a06
 
 pkgname = gnatcoll-iconv-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ff3cf61519bc..c4d22fa250f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Pierre-Marie de Rodat <pmderodat on #ada at freenode.net>
 
 pkgname=gnatcoll-iconv-git
-pkgver=r2776.4ff02cdf
+pkgver=r2777.2c426fe7
 pkgrel=1
 
 pkgdesc='GNAT Components Collection - Bindings to Libiconv'
@@ -15,10 +15,8 @@ makedepends=('git' 'gprbuild')
 provides=('gnatcoll-iconv')
 conflicts=('gnatcoll-iconv' 'gnatcoll')
 
-source=('git+https://github.com/AdaCore/gnatcoll-bindings.git'
-        'no-rpath.patch')
-sha1sums=('SKIP'
-          'aaf6f2b07f9c594413479ba1f884366f4c122a06')
+source=('git+https://github.com/AdaCore/gnatcoll-bindings.git')
+sha1sums=('SKIP')
 
 pkgver() {
     cd "$srcdir/gnatcoll-bindings"
@@ -30,7 +28,6 @@ pkgver() {
 prepare()
 {
     cd "$srcdir/gnatcoll-bindings"
-    patch -Np0 -i "$srcdir/no-rpath.patch"
 }
 
 build()
diff --git a/no-rpath.patch b/no-rpath.patch
deleted file mode 100644
index 1faeeacfdb21..000000000000
--- a/no-rpath.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git setup_support.py setup_support.py
-index 102f8191..9ae009b6 100644
---- setup_support.py
-+++ setup_support.py
-@@ -234,6 +234,8 @@ class SetupApp(object):
-             config.save_data()
- 
-         for gpr_args, gpr_vars in self.variants(config, 'build'):
-+            if args.no_rpath:
-+                gpr_args.append('-R')
-             config.gprbuild(
-                 self.project,
-                 *gpr_args,
-@@ -286,6 +288,8 @@ class SetupApp(object):
-         self.build_cmd = self.parser.add_parser('build',
-                                                 help='build %s' % self.name)
-         Config.add_arguments(self.build_cmd)
-+        self.build_cmd.add_argument('--no-rpath', '-R', action='store_true',
-+                                    help='do not use rpath')
-         self.build_cmd.set_defaults(command=self.build)
- 
-         # Clean command