فهرست منبع

xlib_libX11: don't build documentation

Closes #1387

The documentation step needs working groff and ps2pdf on the host, and
only slows down the build, so just disable it.

At the same time, cleanup the overlong _CONF_OPT line.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 15 سال پیش
والد
کامیت
a12ef5db91
2فایلهای تغییر یافته به همراه9 افزوده شده و 2 حذف شده
  1. 2 1
      CHANGES
  2. 7 1
      package/x11r7/xlib_libX11/xlib_libX11.mk

+ 2 - 1
CHANGES

@@ -10,7 +10,7 @@
 	Updated/fixed packages: busybox, dosfstools, e2fsprogs,
 	freetype, iperf, iptables, less, libgcrypt, libglib2, libpng,
 	libxml2, mdadm, memstat, mtd-utils, nano, openssl, php, pppd,
-	setserial, squashfs, wget, xlib_libXfont
+	setserial, squashfs, wget, xlib_libX11, xlib_libXfont
 
 	Issues resolved (http://bugs.uclibc.org):
 
@@ -27,6 +27,7 @@
 	#1303: Add librsync package
 	#1327: mtd-utils compile failure due to lack of --sysroot in CFLAGS
 	#1345: Bump pppd to 2.4.5 and convert to Makefile.autotools.in
+	#1387: xlib_libX11-1.3.2 can't find libjpeg
 	#1411: [SECURITY] Update openssl package to 0.9.8n
 	#1417: Bump iptables to 1.4.7
 	#1423: Bump e2fsprogs to 1.41.11

+ 7 - 1
package/x11r7/xlib_libX11/xlib_libX11.mk

@@ -10,7 +10,13 @@ XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBX11_AUTORECONF = YES
 XLIB_LIBX11_INSTALL_STAGING = YES
 XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_bigreqsproto xproto_xcmiscproto
-XLIB_LIBX11_CONF_OPT = --disable-malloc0returnsnull --with-xcb --enable-shared --disable-static --with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h
+XLIB_LIBX11_CONF_OPT = \
+	--disable-malloc0returnsnull \
+	--with-xcb \
+	--enable-shared \
+	--disable-static \
+	--with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h \
+	--disable-specs
 
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11))