diff options
| author | Stanislav Brabec <utx@penguin.cz> | 2009-04-02 19:45:18 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2009-04-02 19:45:18 +0000 |
| commit | 7de2f107cf18ed77f9eaa0a5a7d6a07b552ce7af (patch) | |
| tree | ecef2e6c40748def7d5cc68fdedf4a4674ece55b /recipes/wireless-tools | |
| parent | 9c67c93114222bc6a33e653c21a1fa71a5d65e5e (diff) | |
| parent | bc4bf696b52c62c68c58c41daffa2aa1c3949492 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/wireless-tools')
| -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 |
3 files changed, 14 insertions, 1 deletions
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" |