Browse Source

add some dependencies and minor fixes

Waldemar Brodkorb 13 years ago
parent
commit
6def834a1c
4 changed files with 6 additions and 2 deletions
  1. 3 2
      package/libXft/Makefile
  2. 1 0
      package/lxappearance/Makefile
  3. 1 0
      package/pango/Makefile
  4. 1 0
      package/pixman/Makefile

+ 3 - 2
package/libXft/Makefile

@@ -22,8 +22,6 @@ $(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,LIBXFT_DEV,libxft-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFT_DEV},${PKGSC_LIBXFT_DEV}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-CONFIGURE_ARGS+=	--disable-malloc0returnsnull \
-			--disable-install-makestrs
 
 libxft-install:
 	${INSTALL_DIR} ${IDIR_LIBXFT}/usr/lib
@@ -32,5 +30,8 @@ libxft-install:
 libxft-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBXFT_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXFT_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBXFT_DEV}/usr/lib/pkgconfig
+	$(CP) ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_LIBXFT_DEV}/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk

+ 1 - 0
package/lxappearance/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		7eabab6f4a358dbc6a84e260a0e7f6c2
 PKG_DESCR:=		LXDE ...
 PKG_SECTION:=		x11/lxde
+PKG_BUILDDEP:=		gtk+
 PKG_URL:=		http://lxde.org/
 PKG_SITES:=		http://netcologne.dl.sourceforge.net/project/lxde/LXAppearance/
 

+ 1 - 0
package/pango/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		22ad1c8d3fda7e73b0798035f3dd96bc
 PKG_DESCR:=		pango library
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		libXft
 PKG_URL:=		http://www.pango.org/
 PKG_SITES:=		${MASTER_SITE_GNOME:=pango/1.28/}
 PKG_NEED_CXX:=		1

+ 1 - 0
package/pixman/Makefile

@@ -26,6 +26,7 @@ $(eval $(call PKG_template,PIXMAN,pixman,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,PIXMAN_DEV,pixman-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PIXMAN_DEV},${PKGSC_PIXMAN_DEV},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+CONFIGURE_ARGS+=	--disable-gtk
 
 pixman-install:
 	${INSTALL_DIR} ${IDIR_PIXMAN}/usr/lib