summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-14 08:31:20 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-14 08:31:33 +0200
commit6b61d317e292afa4f7be5d76f94c4556cdc5cf34 (patch)
treecddb80e123042e27908c0eb33b73ccd1196919af
parent0663cc3a67054e672f3840396bcd11a3819bda2a (diff)
darwin cross-compile fixes
-rw-r--r--package/e2fsprogs/Makefile1
-rw-r--r--package/gptfdisk/Makefile4
-rw-r--r--package/gptfdisk/patches/patch-Makefile4
3 files changed, 7 insertions, 2 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index d5822d78f..be6a54482 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -57,6 +57,7 @@ $(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELE
$(eval $(call PKG_template,TUNE2FS_STATIC,tune2fs-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
HOST_CONFIGURE_ARGS+= --disable-rpath \
+ --disable-nls \
--disable-uuidd \
--disable-defrag \
--disable-debugfs
diff --git a/package/gptfdisk/Makefile b/package/gptfdisk/Makefile
index 291bb7ee0..bd01bc0ac 100644
--- a/package/gptfdisk/Makefile
+++ b/package/gptfdisk/Makefile
@@ -22,6 +22,10 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call HOST_template,GPTFDISK,gptfdisk,$(PKG_VERSION)-$(PKG_RELEASE)))
$(eval $(call PKG_template,GPTFDISK,gptfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+ifneq ($(OS_FOR_BUILD),Darwin)
+TARGET_LDFLAGS+= -ltinfo
+endif
+
HOST_STYLE:= manual
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
diff --git a/package/gptfdisk/patches/patch-Makefile b/package/gptfdisk/patches/patch-Makefile
index da0377261..f792fe29d 100644
--- a/package/gptfdisk/patches/patch-Makefile
+++ b/package/gptfdisk/patches/patch-Makefile
@@ -1,5 +1,5 @@
--- gptfdisk-1.0.1.orig/Makefile 2015-10-19 00:35:18.000000000 +0200
-+++ gptfdisk-1.0.1/Makefile 2016-09-12 22:33:25.606675951 +0200
++++ gptfdisk-1.0.1/Makefile 2016-09-14 08:25:55.000000000 +0200
@@ -1,5 +1,5 @@
-CC=gcc
-CXX=g++
@@ -13,7 +13,7 @@
cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncursesw -o cgdisk
-+ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -ltinfo -o cgdisk
++ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o