diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-04-02 11:26:20 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-04-02 11:26:20 +0200 |
| commit | 5cba36b4a8c12a00d4cbaa92dbe265c7af713baf (patch) | |
| tree | a0f9acfb6cb883d065b5612ab3bc48f2be296348 | |
| parent | c96829e8598d37bfea21fd68a679188cf5b6c476 (diff) | |
| parent | b0f170f9cec728483f282c65c44d48b33ac12f2e (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/makedevs/makedevs_1.0.0.bb | 4 | ||||
| -rw-r--r-- | recipes/procps/procps_3.2.7.bb | 6 | ||||
| -rw-r--r-- | recipes/wireless-tools/wireless-tools.inc | 1 | ||||
| -rw-r--r-- | recipes/wireless-tools/wireless-tools/shared_lib_ldflags.patch | 12 | ||||
| -rw-r--r-- | recipes/wireless-tools/wireless-tools_29.bb | 2 |
5 files changed, 19 insertions, 6 deletions
diff --git a/recipes/makedevs/makedevs_1.0.0.bb b/recipes/makedevs/makedevs_1.0.0.bb index 249e1a47c4..5579e61bdd 100644 --- a/recipes/makedevs/makedevs_1.0.0.bb +++ b/recipes/makedevs/makedevs_1.0.0.bb @@ -6,7 +6,7 @@ PRIORITY = "required" SRC_URI = "file://makedevs.c" S = "${WORKDIR}/makedevs-${PV}" -PR = "r6" +PR = "r7" inherit update-alternatives @@ -15,7 +15,7 @@ do_configure() { } do_compile() { - ${CC} ${CFLAGS} -L${STAGING_LIBDIR}/ -o ${S}/makedevs ${S}/makedevs.c + ${CC} ${CFLAGS} ${LDFLAGS} -o ${S}/makedevs ${S}/makedevs.c } do_install() { diff --git a/recipes/procps/procps_3.2.7.bb b/recipes/procps/procps_3.2.7.bb index 689fc33503..6da975adc7 100644 --- a/recipes/procps/procps_3.2.7.bb +++ b/recipes/procps/procps_3.2.7.bb @@ -1,6 +1,6 @@ require procps.inc -PR = "r7" +PR = "r8" inherit update-rc.d @@ -22,8 +22,8 @@ FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${ba CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \ - CPPFLAGS=-I${STAGING_INCDIR} \ - LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \ + CPPFLAGS=-I${STAGING_INCDIR} \ + LDFLAGS="${LDFLAGS}" \ CURSES=-lncurses \ install='install -D' \ ldconfig=echo" diff --git a/recipes/wireless-tools/wireless-tools.inc b/recipes/wireless-tools/wireless-tools.inc index 36ee3eddef..d2a7b89a50 100644 --- a/recipes/wireless-tools/wireless-tools.inc +++ b/recipes/wireless-tools/wireless-tools.inc @@ -7,6 +7,7 @@ LICENSE = "GPL" SRC_URI += "\ http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \ file://man.patch;patch=1 \ + file://shared_lib_ldflags.patch;patch=1 \ file://wireless-tools.if-pre-up \ file://zzz-wireless.if-pre-up" S = "${WORKDIR}/wireless_tools.${PV}" diff --git a/recipes/wireless-tools/wireless-tools/shared_lib_ldflags.patch b/recipes/wireless-tools/wireless-tools/shared_lib_ldflags.patch new file mode 100644 index 0000000000..85abde0ff3 --- /dev/null +++ b/recipes/wireless-tools/wireless-tools/shared_lib_ldflags.patch @@ -0,0 +1,12 @@ +diff -urN wireless_tools.29.orig/Makefile wireless_tools.29/Makefile +--- wireless_tools.29.orig/Makefile 2007-09-17 23:56:46.000000000 +0000 ++++ wireless_tools.29/Makefile 2009-04-02 09:22:14.000000000 +0000 +@@ -145,7 +145,7 @@ + + # Compilation of the dynamic library + $(DYNAMIC): $(OBJS:.o=.so) +- $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^ ++ $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^ + + # Compilation of the static library + $(STATIC): $(OBJS:.o=.so) diff --git a/recipes/wireless-tools/wireless-tools_29.bb b/recipes/wireless-tools/wireless-tools_29.bb index c83ae175e0..196a1942d1 100644 --- a/recipes/wireless-tools/wireless-tools_29.bb +++ b/recipes/wireless-tools/wireless-tools_29.bb @@ -1,3 +1,3 @@ require wireless-tools.inc -PR = "r2" +PR = "r3" |