Browse Source

remove duplicate call of CFLAGS, remove /usr/local from compiler paths

Waldemar Brodkorb 14 năm trước cách đây
mục cha
commit
1168c2a747

+ 1 - 1
package/dillo/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dillo
 PKG_VERSION:=		2.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f8bcd62093f178bed81e46cc54e73f42
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps

+ 11 - 0
package/dillo/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- dillo-2.2.orig/Makefile.in	2010-02-11 11:20:01.000000000 +0100
++++ dillo-2.2/Makefile.in	2011-01-07 21:37:49.000000000 +0100
+@@ -242,7 +242,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = lout dw dlib dpip src doc dpid dpi test
++SUBDIRS = lout dw dlib dpip src doc dpid dpi
+ EXTRA_DIST = Doxyfile dillorc install-dpi-local
+ sysconf_DATA = dillorc
+ all: config.h

+ 14 - 0
package/dillo/patches/patch-configure

@@ -0,0 +1,14 @@
+--- dillo-2.2.orig/configure	2010-02-11 11:19:59.000000000 +0100
++++ dillo-2.2/configure	2011-01-07 21:35:04.000000000 +0100
+@@ -5830,11 +5830,6 @@ typedef unsigned char   bool_t;
+ _______EOF
+ 
+ 
+-if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then
+-  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-  LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-fi
+-
+ for ac_func in gethostbyname
+ do :
+   ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"

+ 11 - 0
package/dillo/patches/patch-src_IO_Makefile_in

@@ -0,0 +1,11 @@
+--- dillo-2.2.orig/src/IO/Makefile.in	2010-02-11 11:20:01.000000000 +0100
++++ dillo-2.2/src/IO/Makefile.in	2011-01-07 21:38:15.000000000 +0100
+@@ -188,7 +188,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CPPFLAGS = -DDILLO_BINDIR='"$(bindir)/"'
+-AM_CFLAGS = @LIBFLTK_CFLAGS@
++AM_CFLAGS = 
+ AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
+ noinst_LIBRARIES = libDiof.a
+ libDiof_a_SOURCES = \