From 2548d641ca7adfe3dcf31d09bb2f9b047b186a0f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 23 Jan 2014 08:12:50 +0100 Subject: remove jtools/java host dir. use host stuff instead. fix arm building. --- package/libXt/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'package/libXt/Makefile') diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 69cd67d2f..32b4483d0 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -5,20 +5,24 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXt PKG_VERSION:= 1.1.3 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 7a80ed7aba06668b12ebd0910318a1f1 PKG_DESCR:= X Toolkit Intrinsics libraries PKG_SECTION:= x11/libs PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb +PKG_BUILDDEP:= autotool util-macros-host libXt-host PKG_BUILDDEP:= autotool libSM libX11 kbproto util-macros PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxt PKG_OPTS:= dev +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto AUTOTOOL_STYLE:= autoreconf TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-malloc0returnsnull @@ -27,4 +31,5 @@ libxt-install: ${INSTALL_DIR} ${IDIR_LIBXT}/usr/lib ${CP} ${WRKINST}/usr/lib/libXt.so* ${IDIR_LIBXT}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 1de32ab616744add3f1748084610e7a5b3d654cd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 24 Jan 2014 15:23:44 +0100 Subject: fix dependencies --- package/libXt/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package/libXt/Makefile') diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 32b4483d0..2e8664483 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -10,8 +10,9 @@ PKG_MD5SUM:= 7a80ed7aba06668b12ebd0910318a1f1 PKG_DESCR:= X Toolkit Intrinsics libraries PKG_SECTION:= x11/libs PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb -PKG_BUILDDEP:= autotool util-macros-host libXt-host -PKG_BUILDDEP:= autotool libSM libX11 kbproto util-macros +PKG_BUILDDEP:= autotool util-macros-host libICE-host libSM-host +PKG_BUILDDEP+= libXt-host +PKG_BUILDDEP+= libSM libX11 kbproto util-macros PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxt PKG_OPTS:= dev -- cgit v1.2.3 From 9d46f6e49bf921dd673849d9993d15d34070626a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 27 Jan 2014 10:00:40 +0100 Subject: need to provide CPPFLAGS for build --- package/libXt/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/libXt/Makefile') diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 2e8664483..61db0b88f 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -26,6 +26,7 @@ $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN HOST_STYLE:= auto AUTOTOOL_STYLE:= autoreconf TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) +CONFIGURE_ENV+= CFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)" CONFIGURE_ARGS+= --disable-malloc0returnsnull libxt-install: -- cgit v1.2.3