diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-07 21:39:47 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-07 21:39:47 +0100 |
| commit | 1168c2a747460b62e85bc021f16f8d21ff2a6b86 (patch) | |
| tree | 626add6bd6a540f97486055ca68cef445ebd6cd1 /package | |
| parent | acd808ff41ae90f1e22088654124f6c4ec149e83 (diff) | |
remove duplicate call of CFLAGS, remove /usr/local from compiler paths
Diffstat (limited to 'package')
| -rw-r--r-- | package/dillo/Makefile | 2 | ||||
| -rw-r--r-- | package/dillo/patches/patch-Makefile_in | 11 | ||||
| -rw-r--r-- | package/dillo/patches/patch-configure | 14 | ||||
| -rw-r--r-- | package/dillo/patches/patch-src_IO_Makefile_in | 11 |
4 files changed, 37 insertions, 1 deletions
diff --git a/package/dillo/Makefile b/package/dillo/Makefile index 142bbb1b8..1c2bcf500 100644 --- a/package/dillo/Makefile +++ b/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 diff --git a/package/dillo/patches/patch-Makefile_in b/package/dillo/patches/patch-Makefile_in new file mode 100644 index 000000000..6b18010d3 --- /dev/null +++ b/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 diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure new file mode 100644 index 000000000..233acb5a8 --- /dev/null +++ b/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" diff --git a/package/dillo/patches/patch-src_IO_Makefile_in b/package/dillo/patches/patch-src_IO_Makefile_in new file mode 100644 index 000000000..242d86f5a --- /dev/null +++ b/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 = \ |