diff options
author | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
commit | 8647aee53c2f9f5458e57fe7ac212da40a555594 (patch) | |
tree | b99a8fbc859d18a244ea5ac496083e66ffaa330d /libre/bfgminer-libre/remove-dangerous-rpath.patch | |
parent | 3a14409a347f3423bf2a4ab847edff625b671e20 (diff) | |
parent | 0a5c7083d197551290bc762f4ba90210cb733a5e (diff) | |
download | abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.gz abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.bz2 abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.zip |
Merge branch 'master' of vparabola:abslibre
Conflicts:
java/not-working/java-bnd/PKGBUILD
libre/parabola-keyring/PKGBUILD
Diffstat (limited to 'libre/bfgminer-libre/remove-dangerous-rpath.patch')
-rw-r--r-- | libre/bfgminer-libre/remove-dangerous-rpath.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libre/bfgminer-libre/remove-dangerous-rpath.patch b/libre/bfgminer-libre/remove-dangerous-rpath.patch index a2bcfc87b..b56cb21ba 100644 --- a/libre/bfgminer-libre/remove-dangerous-rpath.patch +++ b/libre/bfgminer-libre/remove-dangerous-rpath.patch @@ -1,11 +1,11 @@ ---- Makefile.am.orig -+++ Makefile.am -@@ -38,7 +38,7 @@ - if NEED_LIBBLKMAKER - SUBDIRS += libblkmaker - bfgminer_CPPFLAGS += -Ilibblkmaker --bfgminer_LDFLAGS += -Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs -+bfgminer_LDFLAGS += -Llibblkmaker/.libs - bfgminer_LDADD += -lblkmaker_jansson-0.1 -lblkmaker-0.1 - - if HAVE_CYGWIN +--- configure.ac.orig ++++ configure.ac +@@ -514,7 +514,7 @@ + ]) + else + libblkmaker_CFLAGS='-Ilibblkmaker' +- libblkmaker_LDFLAGS='-Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs' ++ libblkmaker_LDFLAGS='-Llibblkmaker/.libs' + libblkmaker_LIBS='-lblkmaker_jansson-0.1 -lblkmaker-0.1' + AC_CONFIG_SUBDIRS([libblkmaker]) + fi |