From 5d81720b7fb6ebfe9ee749c637feccc6c80a872f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 Mar 2011 01:27:02 +0200 Subject: fix compile when SSP is active, be more verbose --- package/fltk/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/fltk/Makefile') diff --git a/package/fltk/Makefile b/package/fltk/Makefile index bc0607942..a09bd20f2 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 557544badbacca4ee1ebb2448f6e1f8a PKG_DESCR:= fast light toolkit PKG_SECTION:= libs -PKG_BUILDDEP:= libX11 libXi MesaLib freeglut +PKG_BUILDDEP:= libX11 libXi MesaLib freeglut freetype PKG_URL:= http://www.fltk.org/ PKG_SITES:= http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/ PKG_NEED_CXX:= 1 @@ -27,16 +27,16 @@ $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) -LIBRARIES+=-lssp +LIBRARIES+=-lssp -lssp_nonshared endif ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y) -CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \ +CONFIGURE_ENV+= CXXFLAGS="${TARGET_CXXFLAGS} -fno-threadsafe-statics -fno-builtin -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++" \ LIBS="$(LIBRARIES)" endif -post-install: +libfltk-install: $(INSTALL_DIR) $(IDIR_LIBFLTK)/usr/lib $(CP) ${WRKINST}/usr/lib/libfltk*.so* $(IDIR_LIBFLTK)/usr/lib -- cgit v1.2.3 From 438d7c2dcd3834a437bcfb844f65312d422fc09b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 1 Apr 2011 14:12:48 +0200 Subject: disable Xinerama --- package/fltk/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/fltk/Makefile') diff --git a/package/fltk/Makefile b/package/fltk/Makefile index bc0607942..e829fcc57 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -30,6 +30,8 @@ ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) LIBRARIES+=-lssp endif +CONFIGURE_ARGS+= --disable-xinerama + ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y) CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \ -I${STAGING_TARGET_DIR}/usr/include/uClibc++" \ -- cgit v1.2.3