From c5f539777d607dd959aa247033e41ad77df0a553 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 Aug 2012 15:24:36 +0200 Subject: gpsd-3.7: don't rename patch files when version specific directory works fine Signed-off-by: Martin Jansa --- ...struct-respect-sysroot-also-in-SPLINTOPTS.patch | 30 ++++++++++++++++ .../gpsd-3.7/0004-SConstruct-remove-rpath.patch | 42 ++++++++++++++++++++++ ...espect-sysroot-also-in-SPLINTOPTS_for_3.7.patch | 30 ---------------- .../0004-SConstruct-remove-rpath_for_3.7.patch | 42 ---------------------- meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb | 4 +-- 5 files changed, 74 insertions(+), 74 deletions(-) create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-3.7/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-3.7/0004-SConstruct-remove-rpath.patch delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS_for_3.7.patch delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd/0004-SConstruct-remove-rpath_for_3.7.patch diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch new file mode 100644 index 0000000000..40baa01947 --- /dev/null +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch @@ -0,0 +1,30 @@ +From f5f262be8ae54bd0c0f52802f2007ec89163756f Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Tue, 24 Apr 2012 11:52:35 +0200 +Subject: [PATCH 1/2] SConstruct: respect sysroot also in SPLINTOPTS + +Signed-off-by: Martin Jansa +Signed-off-by: Denis 'GNUtoo' Carikli +--- + SConstruct | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/SConstruct b/SConstruct +index a25e88a..a1bddb9 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1277,7 +1277,10 @@ def Utility(target, source, action): + + # Report splint warnings + # Note: test_bits.c is unsplintable because of the PRI64 macros. +-splintopts = "-I/usr/include/libusb-1.0 +quiet" ++if not env['sysroot']: ++ splintopts = "-I/usr/include/libusb-1.0 +quiet" ++else: ++ splintopts = "-I%s/usr/include/libusb-1.0 +quiet" % env['sysroot'] + # splint does not know about multi-arch, work around that + ma_status, ma = _getstatusoutput('dpkg-architecture -qDEB_HOST_MULTIARCH') + if ma_status == 0: +-- +1.7.5.4 + diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0004-SConstruct-remove-rpath.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0004-SConstruct-remove-rpath.patch new file mode 100644 index 0000000000..83b98bb5ed --- /dev/null +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0004-SConstruct-remove-rpath.patch @@ -0,0 +1,42 @@ +From 7d736bbd517c12d19d7b85a5b0db84732b2f86da Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Tue, 24 Apr 2012 16:24:35 +0200 +Subject: [PATCH 2/2] SConstruct: remove rpath + +* even with correct prefix (without DESTDIR) included it's redundant + WARNING: QA Issue: libgps: + /work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 + contains probably-redundant RPATH /usr/lib +* and with prefix from scons.bbclass it's invalid + WARNING: QA Issue: package libgps contains bad RPATH + /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/image/usr/lib + in file + /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 + +Signed-off-by: Martin Jansa +Signed-off-by: Denis 'GNUtoo' Carikli +--- + SConstruct | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/SConstruct b/SConstruct +index a1bddb9..3e7c607 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1205,8 +1205,11 @@ if qt_env: + + # We don't use installdir here in order to avoid having DESTDIR affect the rpath + if env["shared"] and env["chrpath"]: +- env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ +- % (installdir('libdir', False), )) ++ if not env['sysroot']: ++ env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ ++ % (installdir('libdir', False), )) ++ else: ++ env.AddPostAction(binaryinstall, '$CHRPATH -d "$TARGET"') + + if not env['debug'] and not env['profiling'] and env['strip']: + env.AddPostAction(binaryinstall, '$STRIP $TARGET') +-- +1.7.5.4 + diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS_for_3.7.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS_for_3.7.patch deleted file mode 100644 index 40baa01947..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS_for_3.7.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f5f262be8ae54bd0c0f52802f2007ec89163756f Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 24 Apr 2012 11:52:35 +0200 -Subject: [PATCH 1/2] SConstruct: respect sysroot also in SPLINTOPTS - -Signed-off-by: Martin Jansa -Signed-off-by: Denis 'GNUtoo' Carikli ---- - SConstruct | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/SConstruct b/SConstruct -index a25e88a..a1bddb9 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1277,7 +1277,10 @@ def Utility(target, source, action): - - # Report splint warnings - # Note: test_bits.c is unsplintable because of the PRI64 macros. --splintopts = "-I/usr/include/libusb-1.0 +quiet" -+if not env['sysroot']: -+ splintopts = "-I/usr/include/libusb-1.0 +quiet" -+else: -+ splintopts = "-I%s/usr/include/libusb-1.0 +quiet" % env['sysroot'] - # splint does not know about multi-arch, work around that - ma_status, ma = _getstatusoutput('dpkg-architecture -qDEB_HOST_MULTIARCH') - if ma_status == 0: --- -1.7.5.4 - diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0004-SConstruct-remove-rpath_for_3.7.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0004-SConstruct-remove-rpath_for_3.7.patch deleted file mode 100644 index 83b98bb5ed..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0004-SConstruct-remove-rpath_for_3.7.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7d736bbd517c12d19d7b85a5b0db84732b2f86da Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 24 Apr 2012 16:24:35 +0200 -Subject: [PATCH 2/2] SConstruct: remove rpath - -* even with correct prefix (without DESTDIR) included it's redundant - WARNING: QA Issue: libgps: - /work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 - contains probably-redundant RPATH /usr/lib -* and with prefix from scons.bbclass it's invalid - WARNING: QA Issue: package libgps contains bad RPATH - /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/image/usr/lib - in file - /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 - -Signed-off-by: Martin Jansa -Signed-off-by: Denis 'GNUtoo' Carikli ---- - SConstruct | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/SConstruct b/SConstruct -index a1bddb9..3e7c607 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1205,8 +1205,11 @@ if qt_env: - - # We don't use installdir here in order to avoid having DESTDIR affect the rpath - if env["shared"] and env["chrpath"]: -- env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ -- % (installdir('libdir', False), )) -+ if not env['sysroot']: -+ env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ -+ % (installdir('libdir', False), )) -+ else: -+ env.AddPostAction(binaryinstall, '$CHRPATH -d "$TARGET"') - - if not env['debug'] and not env['profiling'] and env['strip']: - env.AddPostAction(binaryinstall, '$STRIP $TARGET') --- -1.7.5.4 - diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb index af08ceb53f..e8f4cada0a 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb @@ -8,8 +8,8 @@ PROVIDES = "virtual/gpsd" PR = "r0" SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ - file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS_for_3.7.patch \ - file://0004-SConstruct-remove-rpath_for_3.7.patch \ + file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ + file://0004-SConstruct-remove-rpath.patch \ file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \ file://gpsd-default \ -- cgit 1.2.3-korg