diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
| commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
| tree | 76e74807bc479502e13866b581b6bf86734ec634 /sci-geosciences/gpsd/files | |
| parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) | |
gentoo resync : 13.10.2019
Diffstat (limited to 'sci-geosciences/gpsd/files')
3 files changed, 22 insertions, 12 deletions
diff --git a/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch new file mode 100644 index 000000000000..0500f385d79d --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch @@ -0,0 +1,11 @@ +--- gpsd-3.18.1/SConstruct.orig 2018-10-19 12:45:40.000000000 -0700 ++++ gpsd-3.18.1/SConstruct 2019-10-02 11:49:00.848685223 -0700 +@@ -1796,8 +1796,6 @@ # third-party client programs should not + binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) + binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, + libgps_version)) +-# Work around a minor bug in InstallSharedLib() link handling +-env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) + + if qt_env: + binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), diff --git a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch new file mode 100644 index 000000000000..8008dd54fe9c --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch @@ -0,0 +1,11 @@ +--- gpsd-3.19/SConstruct.orig 2019-07-01 19:00:17.000000000 -0700 ++++ gpsd-3.19/SConstruct 2019-10-02 11:49:06.080655901 -0700 +@@ -1980,8 +1980,6 @@ # third-party client programs should not + binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) + binaryinstall.append(LibraryInstall(env, installdir('libdir'), libgps_shared, + libgps_version)) +-# Work around a minor bug in InstallSharedLib() link handling +-env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) + + if qt_env: + binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), diff --git a/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch deleted file mode 100644 index 83e2907fca5b..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-9999-do_not_rm_library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index c0f083a..4a98580 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries)) - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) - binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version)) - # Work around a minor bug in InstallSharedLib() link handling --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) - - if qt_env: - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version)) |