diff options
| -rw-r--r-- | mk/host-bottom.mk | 6 | ||||
| -rw-r--r-- | mk/vars.mk | 4 | ||||
| -rw-r--r-- | package/gettext-tiny/Makefile | 8 | ||||
| -rw-r--r-- | package/gettext-tiny/patches/patch-Makefile | 15 | ||||
| -rw-r--r-- | package/glib/patches/patch-Makefile_in | 11 |
5 files changed, 40 insertions, 4 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index ecab37775..4f4dbf3c5 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -20,6 +20,7 @@ ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE} ${CP} ${SCRIPT_DIR}/config.guess $$i; \ fi; \ done; +ifneq (${HOST_STYLE},manual) ifeq ($(strip ${HOST_STYLE}),) cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${HOST_CONFIGURE_ENV} \ @@ -54,6 +55,7 @@ else --disable-nls \ ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) endif +endif touch $@ host-build: @@ -67,6 +69,7 @@ hpkg-install: ${ALL_HOSTINST} host-install: ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE} @$(CMD_TRACE) "host installing... " +ifneq (${HOST_STYLE},manual) ifeq ($(strip ${HOST_STYLE}),) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) @@ -75,6 +78,9 @@ else cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) endif +else + env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE) +endif rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC} exec ${MAKE} host-extract $(MAKE_TRACE) mkdir -p ${HOST_WRKINST} diff --git a/mk/vars.mk b/mk/vars.mk index dad3d939a..93a9a5988 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -142,10 +142,10 @@ CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,) # host compiler flags CXX_FOR_BUILD?= g++ -CPPFLAGS_FOR_BUILD?= +CPPFLAGS_FOR_BUILD?= -I$(STAGING_HOST_DIR)/usr/include CFLAGS_FOR_BUILD= -O2 -Wall $(CF_FOR_BUILD) CXXFLAGS_FOR_BUILD?= -O2 -Wall -LDFLAGS_FOR_BUILD?= +LDFLAGS_FOR_BUILD?= -L/opt/local/lib FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile index ecd237c1b..1cb94100b 100644 --- a/package/gettext-tiny/Makefile +++ b/package/gettext-tiny/Makefile @@ -15,10 +15,18 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,GETTEXT_TINY,gettext-tiny,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,GETTEXT_TINY,gettext-tiny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= manual CONFIG_STYLE:= manual +gettext-tiny-hostinstall: + ${CP} ${WRKBUILD}/include/libintl.h ${STAGING_HOST_DIR}/usr/include + ${CP} ${WRKBUILD}/libintl.a ${STAGING_HOST_DIR}/usr/lib + +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gettext-tiny/patches/patch-Makefile b/package/gettext-tiny/patches/patch-Makefile index 45cbae4dc..c9584ef3c 100644 --- a/package/gettext-tiny/patches/patch-Makefile +++ b/package/gettext-tiny/patches/patch-Makefile @@ -1,5 +1,5 @@ --- gettext-tiny-0.0.3.orig/Makefile 2013-06-30 06:48:42.000000000 +0200 -+++ gettext-tiny-0.0.3/Makefile 2013-10-04 11:58:03.000000000 +0200 ++++ gettext-tiny-0.0.3/Makefile 2013-10-30 22:13:29.000000000 +0100 @@ -1,4 +1,4 @@ -prefix=/usr/local +prefix=/usr @@ -15,7 +15,18 @@ AR ?= $(CROSS_COMPILE)ar RANLIB ?= $(CROSS_COMPILE)ranlib -@@ -56,13 +56,16 @@ xgettext: +@@ -47,22 +47,25 @@ libintl.a: $(LIBOBJS) + $(RANLIB) $@ + + msgmerge: $(OBJS) +- $(CC) $(LDFLAGS) -static -o $@ src/msgmerge.o $(PARSEROBJS) ++ $(CC) $(LDFLAGS) -o $@ src/msgmerge.o $(PARSEROBJS) + + msgfmt: $(OBJS) +- $(CC) $(LDFLAGS) -static -o $@ src/msgfmt.o $(PARSEROBJS) ++ $(CC) $(LDFLAGS) -o $@ src/msgfmt.o $(PARSEROBJS) + + xgettext: cp src/xgettext.sh ./xgettext $(DESTDIR)$(libdir)/%.a: %.a diff --git a/package/glib/patches/patch-Makefile_in b/package/glib/patches/patch-Makefile_in new file mode 100644 index 000000000..b53217f1e --- /dev/null +++ b/package/glib/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- glib-2.28.1.orig/Makefile.in 2011-02-18 16:22:03.000000000 +0100 ++++ glib-2.28.1/Makefile.in 2013-10-31 19:55:48.000000000 +0100 +@@ -422,7 +422,7 @@ EXTRA_DIST = ChangeLog.pre-2-20 ChangeLo + gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in + TEST_PROGS = + ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} +-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs ++SUBDIRS = . m4macros glib gmodule gthread gobject gio po + DIST_SUBDIRS = $(SUBDIRS) build + bin_SCRIPTS = glib-gettextize + AM_CPPFLAGS = \ |