diff options
Diffstat (limited to 'package')
-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 |
3 files changed, 32 insertions, 2 deletions
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 = \ |