aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-04-29 01:30:48 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-04-29 01:30:48 +0000
commitf460eb1cdbb88e51b2cb128261737931ae215774 (patch)
tree36b3ba353b28b629ca2104160377ab17b28d0b2a /package
parentb63212e0a6cc6fbc554a2b593f79d89126bf7222 (diff)
downloadupstream-f460eb1cdbb88e51b2cb128261737931ae215774.tar.gz
upstream-f460eb1cdbb88e51b2cb128261737931ae215774.tar.bz2
upstream-f460eb1cdbb88e51b2cb128261737931ae215774.zip
fixes for a few build errors on osx without fink
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7065 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/Makefile6
-rw-r--r--package/udev/patches/003-portability.patch50
2 files changed, 53 insertions, 3 deletions
diff --git a/package/Makefile b/package/Makefile
index 04b2912dc7..c3fc01c7df 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -58,9 +58,9 @@ install:
IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
done || true \
)
- @-find $(BUILD_DIR)/root -name CVS | xargs -r rm -rf
- @-find $(BUILD_DIR)/root -name .svn | xargs -r rm -rf
- @-find $(BUILD_DIR)/root -name '.#*' | xargs -r rm -f
+ @-find $(BUILD_DIR)/root -name CVS | $(XARGS) rm -rf
+ @-find $(BUILD_DIR)/root -name .svn | $(XARGS) rm -rf
+ @-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f
index: $(PACKAGE_DIR)/Packages
diff --git a/package/udev/patches/003-portability.patch b/package/udev/patches/003-portability.patch
new file mode 100644
index 0000000000..0744f5c259
--- /dev/null
+++ b/package/udev/patches/003-portability.patch
@@ -0,0 +1,50 @@
+diff -ur udev.old/Makefile udev.dev/Makefile
+--- udev.old/Makefile 2007-04-29 03:20:27.056490320 +0200
++++ udev.dev/Makefile 2007-04-29 03:26:32.693904984 +0200
+@@ -246,13 +246,15 @@
+ .PHONY: install-config
+
+ install-man:
+- $(INSTALL_DATA) -D udev.7 $(DESTDIR)$(mandir)/man7/udev.7
+- $(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
+- $(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
+- $(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
+- $(INSTALL_DATA) -D udevtrigger.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8
+- $(INSTALL_DATA) -D udevsettle.8 $(DESTDIR)$(mandir)/man8/udevsettle.8
+- $(INSTALL_DATA) -D udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8
++ $(INSTALL) -d $(DESTDIR)$(mandir)/man7
++ $(INSTALL) -d $(DESTDIR)$(mandir)/man8
++ $(INSTALL_DATA) udev.7 $(DESTDIR)$(mandir)/man7/udev.7
++ $(INSTALL_DATA) udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
++ $(INSTALL_DATA) udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
++ $(INSTALL_DATA) udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
++ $(INSTALL_DATA) udevtrigger.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8
++ $(INSTALL_DATA) udevsettle.8 $(DESTDIR)$(mandir)/man8/udevsettle.8
++ $(INSTALL_DATA) udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8
+ - ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
+ @extras="$(EXTRAS)"; for target in $$extras; do \
+ $(MAKE) -C $$target $@ || exit 1; \
+@@ -275,13 +277,16 @@
+
+ install-bin:
+ $(INSTALL) -d $(DESTDIR)$(udevdir)
+- $(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd
+- $(INSTALL_PROGRAM) -D udevtrigger $(DESTDIR)$(sbindir)/udevtrigger
+- $(INSTALL_PROGRAM) -D udevsettle $(DESTDIR)$(sbindir)/udevsettle
+- $(INSTALL_PROGRAM) -D udevcontrol $(DESTDIR)$(sbindir)/udevcontrol
+- $(INSTALL_PROGRAM) -D udevmonitor $(DESTDIR)$(usrsbindir)/udevmonitor
+- $(INSTALL_PROGRAM) -D udevinfo $(DESTDIR)$(usrbindir)/udevinfo
+- $(INSTALL_PROGRAM) -D udevtest $(DESTDIR)$(usrbindir)/udevtest
++ $(INSTALL) -d $(DESTDIR)$(sbindir)
++ $(INSTALL) -d $(DESTDIR)$(usrbindir)
++ $(INSTALL) -d $(DESTDIR)$(usrsbindir)
++ $(INSTALL_PROGRAM) udevd $(DESTDIR)$(sbindir)/udevd
++ $(INSTALL_PROGRAM) udevtrigger $(DESTDIR)$(sbindir)/udevtrigger
++ $(INSTALL_PROGRAM) udevsettle $(DESTDIR)$(sbindir)/udevsettle
++ $(INSTALL_PROGRAM) udevcontrol $(DESTDIR)$(sbindir)/udevcontrol
++ $(INSTALL_PROGRAM) udevmonitor $(DESTDIR)$(usrsbindir)/udevmonitor
++ $(INSTALL_PROGRAM) udevinfo $(DESTDIR)$(usrbindir)/udevinfo
++ $(INSTALL_PROGRAM) udevtest $(DESTDIR)$(usrbindir)/udevtest
+ @extras="$(EXTRAS)"; for target in $$extras; do \
+ $(MAKE) -C $$target $@ || exit 1; \
+ done;