summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-30 10:49:03 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-30 10:49:03 (GMT)
commit181bf9bdca8065de5a592587bd86823e0b288ce0 (patch)
tree61792ecc1051ba4f4d2d988aea3db7666562322f
parentf173d6ae31082439be71d9f5dcf6074ca6355520 (diff)
fix build on FreeBSD host
-rw-r--r--package/firefox/Makefile2
-rw-r--r--package/git/Makefile7
-rw-r--r--package/git/patches/patch-Makefile52
-rw-r--r--package/libtool/Makefile4
-rw-r--r--package/mysql/patches/patch-configure53
-rw-r--r--scripts/automake.dep3
6 files changed, 86 insertions, 35 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 234386e..3280d71 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -44,6 +44,8 @@ CONFIGURE_ARGS+= --enable-application=browser \
--with-system-png \
--with-system-nss \
--with-system-nspr \
+ --with-libIDL-prefix=${STAGING_DIR}/usr \
+ --with-glib-prefix=${STAGING_DIR}/usr \
--enable-libxul \
--disable-tests \
--disable-static \
diff --git a/package/git/Makefile b/package/git/Makefile
index a3c9a8f..162cc13 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= git
-PKG_VERSION:= 1.7.1
+PKG_VERSION:= 1.7.2.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= d2fefae2b787a19601c09d89975ce5fb
+PKG_MD5SUM:= 13fc44363df744a401552e73e5476351
PKG_DESCR:= fast version control system
PKG_SECTION:= scm
PKG_DEPENDS:= libopenssl libcurl libexpat libpthread
@@ -18,8 +18,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-MAKE_ENV+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 \
- NO_CROSS_DIRECTORY_HARDLINKS=1 \
+MAKE_ENV+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \
CURLDIR=${STAGING_DIR} EXPATDIR=${STAGING_DIR}
XAKE_FLAGS+= uname_S=Linux uname_O=GNU/Linux
CONFIGURE_ENV+= ac_cv_c_c99_format=yes \
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
index 6f3b70e..dcfd4dd 100644
--- a/package/git/patches/patch-Makefile
+++ b/package/git/patches/patch-Makefile
@@ -1,26 +1,6 @@
---- git-1.6.5.5.orig/Makefile 2009-12-06 04:51:25.000000000 +0100
-+++ git-1.6.5.5/Makefile 2009-12-07 20:13:40.753866786 +0100
-@@ -218,8 +218,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de
-
- # CFLAGS and LDFLAGS are for the users to override from the command line.
-
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
-+CFLAGS ?= -g -O2 -Wall
-+LDFLAGS ?=
- ALL_CFLAGS = $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
-@@ -241,7 +241,7 @@ bindir_relative = bin
- bindir = $(prefix)/$(bindir_relative)
- mandir = share/man
- infodir = share/info
--gitexecdir = libexec/git-core
-+gitexecdir = sbin/git-core
- sharedir = $(prefix)/share
- template_dir = share/git-core/templates
- htmldir = share/doc/git-doc
-@@ -1417,7 +1417,6 @@ builtin-help.o: builtin-help.c common-cm
+--- git-1.7.2.1.orig/Makefile 2010-07-28 19:03:43.000000000 +0200
++++ git-1.7.2.1/Makefile 2010-07-30 12:25:52.000000000 +0200
+@@ -1594,7 +1594,6 @@ builtin/help.s builtin/help.o: EXTRA_CPP
$(BUILT_INS): git$X
$(QUIET_BUILT_IN)$(RM) $@ && \
@@ -28,11 +8,31 @@
ln -s git$X $@ 2>/dev/null || \
cp git$X $@
-@@ -1749,7 +1748,6 @@ endif
+@@ -1894,7 +1893,6 @@ git-http-push$X: revision.o http.o http-
+
+ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
+ $(QUIET_LNCP)$(RM) $@ && \
+- ln $< $@ 2>/dev/null || \
+ ln -s $< $@ 2>/dev/null || \
+ cp $< $@
+
+@@ -2077,18 +2075,16 @@ endif
+ { test "$$bindir/" = "$$execdir/" || \
+ { $(RM) "$$execdir/git$X" && \
+ test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+- ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
++ ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
- { for p in $(BUILT_INS); do \
+ for p in $(BUILT_INS); do \
$(RM) "$$execdir/$$p" && \
- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
- done; } && \
+ done && \
+ remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
+ for p in $$remote_curl_aliases; do \
+ $(RM) "$$execdir/$$p" && \
+- ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
+ done && \
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index d043dec..dbf2e3c 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libtool
-PKG_VERSION:= 2.2.8
+PKG_VERSION:= 2.2.10
PKG_RELEASE:= 1
-PKG_MD5SUM:= cad2a7188242bc8dbab0645532ae3d6f
+PKG_MD5SUM:= b745d220e88163fcd9eea0a90ccf21b0
PKG_DESCR:= a generic dynamic object loading library
PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/libtool
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index 1c61d1a..aad04ff 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,6 +1,53 @@
--- mysql-5.1.48.orig/configure 2010-06-03 17:54:47.000000000 +0200
-+++ mysql-5.1.48/configure 2010-07-12 22:51:24.267118950 +0200
-@@ -48273,197 +48273,14 @@ $as_echo "$as_me: error: unknown endiann
++++ mysql-5.1.48/configure 2010-07-30 11:04:50.000000000 +0200
+@@ -19825,45 +19825,7 @@ fi
+ $as_echo_n "checking \"how to check if pid exists\"... " >&6; }
+ PS=$ac_cv_path_PS
+ # Linux style
+-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
+-then
+- FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-# Solaris
+-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
+-then
+- FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-# BSD style
+-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
+-then
+- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-# SysV style
+-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
+-then
+- FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-# Do anybody use this?
+-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
+-then
+- FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-else
+- case $SYSTEM_TYPE in
+- *freebsd*|*dragonfly*)
+- FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+- ;;
+- *darwin*)
+- FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+- ;;
+- *cygwin*)
+- FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+- ;;
+- *netware*)
+- FIND_PROC=
+- ;;
+- *)
+- { { $as_echo "$as_me:$LINENO: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&5
+-$as_echo "$as_me: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&2;}
+- { (exit 1); exit 1; }; }
+- esac
+-fi
++FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+
+ { $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
+ $as_echo "\"$FIND_PROC\"" >&6; }
+@@ -48273,197 +48235,14 @@ $as_echo "$as_me: error: unknown endiann
esac
@@ -198,7 +245,7 @@
{ $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
$as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
-@@ -48581,101 +48398,6 @@ fi
+@@ -48581,101 +48360,6 @@ fi
done
diff --git a/scripts/automake.dep b/scripts/automake.dep
index 13e4e87..2cfd5d3 100644
--- a/scripts/automake.dep
+++ b/scripts/automake.dep
@@ -9,6 +9,8 @@ configure missing
aclocal.m4 configure.in
aclocal.m4 configure.ac
aclocal.m4 acinclude.m4
+config-h.in configure.in
+config-h.in configure.ac
config.h.in configure.in
config.h.in configure.ac
config.h.in aclocal.m4
@@ -31,3 +33,4 @@ configure.in configure.files
acinclude.m4 admin/libtool.m4.in
acinclude.m4 admin/acinclude.m4.in
acinclude.m4 libltdl/ltdl.m4
+libtoolize.in configure