summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/host-bottom.mk6
-rw-r--r--mk/vars.mk4
-rw-r--r--package/gettext-tiny/Makefile8
-rw-r--r--package/gettext-tiny/patches/patch-Makefile15
-rw-r--r--package/glib/Makefile5
-rw-r--r--package/glib/patches/patch-Makefile_in11
-rw-r--r--package/glib/patches/patch-ltmain_sh6
-rw-r--r--package/python2/Makefile2
-rw-r--r--package/python2/patches/patch-Makefile_pre_in11
-rw-r--r--package/python2/patches/patch-setup_py11
10 files changed, 67 insertions, 12 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/Makefile b/package/glib/Makefile
index d5a71f49f..23d0230e5 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= glib
PKG_VERSION:= 2.28.1
PKG_EXTRAVER:= 2.28
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e
PKG_DESCR:= low-level core library that forms the basis of GTK+
PKG_SECTION:= libs
PKG_DEPENDS:= libiconv libpthread
-PKG_BUILDDEP:= gettext-tiny libiconv dbus glib-host
+PKG_BUILDDEP:= gettext-tiny-host gettext-tiny libiconv dbus glib-host
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
PKG_NOPARALLEL:= 1
@@ -42,6 +42,7 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \
ac_cv_func_posix_getgrgid_r=yes
HOST_CONFIGURE_ARGS+= --prefix=$(HOST_WRKINST)/usr \
+ --with-libiconv=gnu \
--enable-debug=no \
--disable-fam
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 = \
diff --git a/package/glib/patches/patch-ltmain_sh b/package/glib/patches/patch-ltmain_sh
index 16078c020..b69b349d4 100644
--- a/package/glib/patches/patch-ltmain_sh
+++ b/package/glib/patches/patch-ltmain_sh
@@ -1,6 +1,6 @@
---- glib-2.33.14.orig/ltmain.sh 2012-09-17 23:25:27.000000000 +0200
-+++ glib-2.33.14/ltmain.sh 2012-09-23 11:07:23.000000000 +0200
-@@ -5853,7 +5853,7 @@ func_mode_link ()
+--- glib-2.28.1.orig/ltmain.sh 2011-02-08 13:25:07.000000000 +0100
++++ glib-2.28.1/ltmain.sh 2013-10-31 19:37:51.000000000 +0100
+@@ -5840,7 +5840,7 @@ func_mode_link ()
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
diff --git a/package/python2/Makefile b/package/python2/Makefile
index ad4b4d781..5c759eaca 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -96,7 +96,7 @@ CONFIGURE_ARGS:= --with-threads \
--without-cxx-main
HOST_STYLE:= auto
-HOST_CONFIGURE_ARGS:= --without-threads \
+HOST_CONFIGURE_ARGS:= --with-threads \
--disable-toolbox-glue \
--without-cxx-main
diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in
index 8c6aba5c2..26077c7fc 100644
--- a/package/python2/patches/patch-Makefile_pre_in
+++ b/package/python2/patches/patch-Makefile_pre_in
@@ -1,5 +1,5 @@
--- Python-2.7.5.orig/Makefile.pre.in 2013-05-12 05:32:49.000000000 +0200
-+++ Python-2.7.5/Makefile.pre.in 2013-10-30 14:10:07.000000000 +0100
++++ Python-2.7.5/Makefile.pre.in 2013-11-01 14:54:24.000000000 +0100
@@ -227,6 +227,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
##########################################################################
# Parser
@@ -8,6 +8,15 @@
PSRCS= \
Parser/acceler.c \
+@@ -456,7 +457,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
+ *) quiet="";; \
+ esac; \
+ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
++ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py build
+
+ # Build static library
+ # avoid long command lines, same as LIBRARY_OBJS
@@ -593,7 +594,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p
$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
@$(MKDIR_P) Include
diff --git a/package/python2/patches/patch-setup_py b/package/python2/patches/patch-setup_py
index 0cb811de9..3a80230c2 100644
--- a/package/python2/patches/patch-setup_py
+++ b/package/python2/patches/patch-setup_py
@@ -1,5 +1,5 @@
--- Python-2.7.5.orig/setup.py 2013-05-12 05:32:54.000000000 +0200
-+++ Python-2.7.5/setup.py 2013-10-30 14:18:23.000000000 +0100
++++ Python-2.7.5/setup.py 2013-11-01 14:53:38.000000000 +0100
@@ -74,7 +74,7 @@ def find_file(filename, std_dirs, paths)
'paths' is a list of additional locations to check; if the file is
found in one of them, the resulting list will contain the directory.
@@ -119,3 +119,12 @@
# This should work on any unixy platform ;-)
# If the user has bothered specifying additional -I and -L flags
# in OPT and LDFLAGS we might as well use them here.
+@@ -837,7 +847,7 @@ class PyBuildExt(build_ext):
+ openssl_ver >= min_openssl_ver)
+
+ if have_any_openssl:
+- if have_usable_openssl:
++ if have_usable_openssl and host_platform != 'darwin':
+ # The _hashlib module wraps optimized implementations
+ # of hash functions from the OpenSSL library.
+ exts.append( Extension('_hashlib', ['_hashopenssl.c'],
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 07:21:03 +0000