aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-11-30 07:29:00 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-11-30 07:29:00 +0000
commita20d47ef531c5abe45429422affba3bbfcca6cc2 (patch)
treec4f7de47a27f99b2ec4837aa7151e388e56dcfcf
parent0183b7d9b8489d36fb1befd3ae22915ab6d56d70 (diff)
downloadaports-a20d47ef531c5abe45429422affba3bbfcca6cc2.tar.bz2
aports-a20d47ef531c5abe45429422affba3bbfcca6cc2.tar.xz
testing/wireless-tools: cleanup
ref #212
-rw-r--r--testing/wireless-tools/APKBUILD29
-rw-r--r--testing/wireless-tools/wireless-tools-29-asneeded.patch13
2 files changed, 30 insertions, 12 deletions
diff --git a/testing/wireless-tools/APKBUILD b/testing/wireless-tools/APKBUILD
index 0e4bf9fe08..b4c726bd0f 100644
--- a/testing/wireless-tools/APKBUILD
+++ b/testing/wireless-tools/APKBUILD
@@ -2,26 +2,31 @@
# Maintainer:
pkgname=wireless-tools
pkgver=29
-pkgrel=0
+pkgrel=1
pkgdesc="Open Source wireless tools"
url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
license="GPL"
-depends="uclibc"
+depends=
makedepends=""
install=
-subpackages=""
-source="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.$pkgver.tar.gz"
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.$pkgver.tar.gz
+ wireless-tools-29-asneeded.patch
+ "
build() {
cd "$srcdir/wireless_tools.$pkgver"
+ patch -p1 -i ../wireless-tools-29-asneeded.patch || return 1
+ make || return 1
+}
- make -j1 || return 1
- install -m755 -D "$srcdir/wireless_tools.$pkgver"/iwpriv "$pkgdir"/usr/sbin/iwpriv
- install -m755 -D "$srcdir/wireless_tools.$pkgver"/iwspy "$pkgdir"/usr/sbin/iwspy
- install -m755 -D "$srcdir/wireless_tools.$pkgver"/iwlist "$pkgdir"/usr/sbin/iwlist
- install -m755 -D "$srcdir/wireless_tools.$pkgver"/iwconfig "$pkgdir"/usr/sbin/iwconfig
- install -m644 -D "$srcdir/wireless_tools.$pkgver"/libiw.so.29 "$pkgdir"/usr/lib/libiw.so.29
- ln -s "$pkgdir"/usr/lib/libiw.so.29 "$pkgdir"/usr/lib/libiw.so
+package() {
+ cd "$srcdir/wireless_tools.$pkgver"
+ make INSTALL_DIR="$pkgdir"/usr/sbin \
+ INSTALL_LIB="$pkgdir"/usr/lib \
+ INSTALL_INC="$pkgdir"/usr/include \
+ INSTALL_MAN="$pkgdir"/usr/share/man install || return 1
}
-md5sums="e06c222e186f7cc013fd272d023710cb wireless_tools.29.tar.gz"
+md5sums="e06c222e186f7cc013fd272d023710cb wireless_tools.29.tar.gz
+9d979950e6965b31d3d136f570273d23 wireless-tools-29-asneeded.patch"
diff --git a/testing/wireless-tools/wireless-tools-29-asneeded.patch b/testing/wireless-tools/wireless-tools-29-asneeded.patch
new file mode 100644
index 0000000000..04f2d869b6
--- /dev/null
+++ b/testing/wireless-tools/wireless-tools-29-asneeded.patch
@@ -0,0 +1,13 @@
+Index: wireless_tools.29/Makefile
+===================================================================
+--- wireless_tools.29.orig/Makefile
++++ wireless_tools.29/Makefile
+@@ -145,7 +145,7 @@ wireless.h:
+
+ # 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)