diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 20:30:04 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-20 21:56:03 +0100 |
| commit | 9f8e5aca342c806d1031e063b00a0045e0eb6c57 (patch) | |
| tree | e9547c4e7c77f1db6e1ea8c9c96b36ee548f641f /admin | |
| parent | f12aae60ad661a67b45ef4370757fa5236ffffff (diff) | |
treewide: use $(STAGING_DIR)/host instead of $(STAGING_DIR_HOST), sync with changes in trunk
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/sudo/Makefile | 4 | ||||
| -rw-r--r-- | admin/sudo/patches/010-cross-compile-fixes.patch | 15 |
2 files changed, 5 insertions, 14 deletions
diff --git a/admin/sudo/Makefile b/admin/sudo/Makefile index 3f2d6f81a..43e92977d 100644 --- a/admin/sudo/Makefile +++ b/admin/sudo/Makefile @@ -64,8 +64,8 @@ define Host/Compile endef define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin - $(CP) $(HOST_BUILD_DIR)/lib/util/mksig{list,name} $(STAGING_DIR_HOST)/bin/ + $(INSTALL_DIR) $(STAGING_DIR)/host/bin + $(CP) $(HOST_BUILD_DIR)/lib/util/mksig{list,name} $(STAGING_DIR)/host/bin/ endef $(eval $(call HostBuild)) diff --git a/admin/sudo/patches/010-cross-compile-fixes.patch b/admin/sudo/patches/010-cross-compile-fixes.patch index 4e80d4d42..b9c1e7995 100644 --- a/admin/sudo/patches/010-cross-compile-fixes.patch +++ b/admin/sudo/patches/010-cross-compile-fixes.patch @@ -1,25 +1,16 @@ diff -rupN sudo-1.8.11p2.orig/lib/util/Makefile.in sudo-1.8.11p2/lib/util/Makefile.in --- sudo-1.8.11p2.orig/lib/util/Makefile.in 2014-10-07 22:26:20.000000000 +0200 +++ sudo-1.8.11p2/lib/util/Makefile.in 2014-12-09 21:44:35.610041162 +0100 -@@ -17,6 +17,8 @@ - # @configure_input@ - # - -+include $(TOPDIR)/rules.mk -+ - #### Start of system configuration section. #### - - srcdir = @srcdir@ -@@ -142,10 +144,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@ +@@ -142,10 +142,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@ esac siglist.c: mksiglist - ./mksiglist > $@ -+ $(STAGING_DIR_HOST)/bin/mksiglist > $@ ++ mksiglist > $@ signame.c: mksigname - ./mksigname > $@ -+ $(STAGING_DIR_HOST)/bin/mksigname > $@ ++ mksigname > $@ mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@ |