Upgrade pcmciautils 017 -> 018

Along with upgrade we are remove usage of LIBC variable inside makefiles as this conflicts with OE's notion of LIBC

Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: kraj/pcmciautils
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/pcmciautils

Thanks,
Khem Raj <[email protected]>
---

Khem Raj (1):
pcmciautils: Upgrade 017 -> 018

 .../pcmciautils-017/version_workaround.patch       |   16 ------
 .../makefile_fix.patch                             |   58 ++++++++++++++++----
 meta/recipes-bsp/pcmciautils/pcmciautils.inc       |    1 +
 meta/recipes-bsp/pcmciautils/pcmciautils_017.bb    |   12 ----
 meta/recipes-bsp/pcmciautils/pcmciautils_018.bb    |   11 ++++
 5 files changed, 59 insertions(+), 39 deletions(-)
 delete mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch
 rename meta/recipes-bsp/pcmciautils/{pcmciautils-017 => pcmciautils-018}/makefile_fix.patch (63%)
 delete mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils_017.bb
 create mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils_018.bb

1.7.4.1

version workaround is done in recipe itself
by adding PV to CFLAGS

Since we define LIBC and pcmciutils use it too
which hinders build when we define LIBC in
environment. Its not used in the builds anyway
so we get rid of depending on it

---
 .../pcmciautils-017/version_workaround.patch       |   16 ------
 .../makefile_fix.patch                             |   58 ++++++++++++++++----
 meta/recipes-bsp/pcmciautils/pcmciautils.inc       |    1 +
 meta/recipes-bsp/pcmciautils/pcmciautils_017.bb    |   12 ----
 meta/recipes-bsp/pcmciautils/pcmciautils_018.bb    |   11 ++++
 5 files changed, 59 insertions(+), 39 deletions(-)
 delete mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils-017/version_workaround.patch
 rename meta/recipes-bsp/pcmciautils/{pcmciautils-017 => pcmciautils-018}/makefile_fix.patch (63%)
 delete mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils_017.bb
 create mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils_018.bb

deleted file mode 100644
index 57efa68..0000000
@@ -1,16 +0,0 @@
-PCMCIAUTILS_VERSION is specified on the commandline but doesn't compile properly 
-under arm gcc 3.4.x so we work around it.
-
-Index: pcmciautils-013/src/pccardctl.c
-===================================================================
---- pcmciautils-013.orig/src/pccardctl.c	2006-03-26 11:56:41.000000000 +0100
-+++ pcmciautils-013/src/pccardctl.c	2006-05-09 22:11:09.000000000 +0100
-@@ -350,7 +350,7 @@
- }
- 
- static void print_header(void) {
--	printf("pcmciautils %s\n", PCMCIAUTILS_VERSION);
-+	printf("pcmciautils 017\n");
- 	printf("Copyright (C) 2004-2005 Dominik Brodowski, (C) 1999 David A. Hinds\n");
- 	printf("Report errors and bugs to <[email protected]>, please.\n");
- }

index 260cccb..410fa5d 100644
@@ -22,6 +22,7 @@ export udevrulesdir = "${sysconfdir}/udev/rules.d"
 export UDEV = "1"
 LD = "${CC}"
 CFLAGS =+ "-I${S}/src"
+CFLAGS =+ -DPCMCIAUTILS_VERSION=\'${PV}\'
 
 PARALLEL_MAKE = ""
 EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'"

deleted file mode 100644
index ff67f7b..0000000
@@ -1,12 +0,0 @@
-require pcmciautils.inc
-
-PR = "r0"
-
-SRC_URI += "file://makefile_fix.patch \
-            file://version_workaround.patch"
-
-SRC_URI[md5sum] = "5245af28eeba57ec0606a874d44d10f7"
-SRC_URI[sha256sum] = "2045f0e8f837f44aed72ac91c1a8cf3b899caf098a25d04f47982be6386bd4e1"
-
-FILES_${PN}-dbg += "${libdir}/udev/.debug"
-FILES_${PN} += "${libdir}/udev"

new file mode 100644
index 0000000..202437a
@@ -0,0 +1,11 @@
+require pcmciautils.inc
+
+SRC_URI += "file://makefile_fix.patch"
+
+SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4"
+SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5"
+
+PR = "r0"
+
+FILES_${PN}-dbg += "${libdir}/udev/.debug"
+FILES_${PN} += "${libdir}/udev"

1.7.4.1

Why are you defining LIBC in the environment? That sounds like a seriously bad idea. Our current environment handling should stop it leaking into a build anyway shouldn't it?

Cheers,

Richard

Op 21 apr 2011, om 21:28 heeft Richard Purdie het volgende geschreven:

In OE .dev we unexport LIBC for that exact reason :)