From c2bd3a43342e37a05a97e12581dd2bd52993877a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Mar 2011 20:20:09 +0200 Subject: Revert "fix conflict, autoseect libgcj" This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04. --- package/pango/Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'package/pango/Makefile') diff --git a/package/pango/Makefile b/package/pango/Makefile index e60684cc8..9224f3d9e 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -26,8 +26,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,PANGO_DEV,pango-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PANGO_DEV},${PKGSC_PANGO_DEV},${PKG_OPTS})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - pango-install: $(INSTALL_DIR) $(IDIR_PANGO)/etc/pango $(INSTALL_DIR) $(IDIR_PANGO)/usr/lib $(IDIR_PANGO)/usr/lib/pango/1.6.0/modules -- cgit v1.2.3 From f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Mar 2011 20:21:13 +0200 Subject: I am to tupid for git, today. Revert "Revert "fix conflict, autoseect libgcj"" This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a. --- package/pango/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/pango/Makefile') diff --git a/package/pango/Makefile b/package/pango/Makefile index 9224f3d9e..e60684cc8 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -26,6 +26,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,PANGO_DEV,pango-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PANGO_DEV},${PKGSC_PANGO_DEV},${PKG_OPTS})) +TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) + pango-install: $(INSTALL_DIR) $(IDIR_PANGO)/etc/pango $(INSTALL_DIR) $(IDIR_PANGO)/usr/lib $(IDIR_PANGO)/usr/lib/pango/1.6.0/modules -- cgit v1.2.3