summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-29 22:33:47 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-29 22:33:47 +0200
commit1115439a910ccc45a54d6bb89828cffe4b91fe81 (patch)
treec620280b31f47f4f708bbcc2076f41b2bd85fbb6
parentd258945b9b0f2b978c0ee2fa4c772827122065f0 (diff)
parentf173d6ae31082439be71d9f5dcf6074ca6355520 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/firefox/Makefile6
-rw-r--r--package/subversion/Makefile28
2 files changed, 10 insertions, 24 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 47686883a..234386e9c 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= firefox
-PKG_VERSION:= 3.6.6
+PKG_VERSION:= 3.6.8
PKG_RELEASE:= 1
-PKG_MD5SUM:= c9a071b31bb90d05edfb93117d0a7537
+PKG_MD5SUM:= 0ee5f14fd8be07513d16131027ebcb61
PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk+ libnotify
@@ -28,6 +28,8 @@ $(eval $(call PKG_template,FIREFOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${P
ifeq (${ADK_LINUX_MIPS64_LEMOTE},y)
CONFIGURE_ARGS+= --disable-ipc
+else ifeq (${ADK_TARGET_LIB_UCLIBC},y)
+CONFIGURE_ARGS+= --disable-ipc
else
CONFIGURE_ARGS+= --enable-ipc
endif
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index 32003a993..7851bd2a4 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -4,18 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= subversion
-PKG_VERSION:= 1.6.9
+PKG_VERSION:= 1.6.12
PKG_RELEASE:= 1
-PKG_MD5SUM:= facaa0ee78c8f24b9af12c74662bbd24
+PKG_MD5SUM:= ae008ac355581c90494fba86cbfc3413
PKG_DESCR:= revision control program
PKG_SECTION:= scm
-PKG_DEPENDS:= zlib apr apr-util libiconv libexpat libsqlite
-PKG_BUILDDEP+= apr-util expat apr zlib libiconv sqlite
-ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),)
-PKG_DEPENDS+= neon
-PKG_BUILDDEP+= neon
-endif
+PKG_DEPENDS:= zlib apr apr-util libiconv libexpat libsqlite neon
+PKG_BUILDDEP+= apr-util expat apr zlib libiconv sqlite neon
PKG_SITES:= http://subversion.tigris.org/downloads/
+PKG_URL:= http://subversion.apache.org/
include ${TOPDIR}/mk/package.mk
@@ -32,20 +29,7 @@ CONFIGURE_ARGS+= --without-jikes
CONFIGURE_ARGS+= --without-jdk
CONFIGURE_ARGS+= --disable-javahl
CONFIGURE_ARGS+= --without-berkeley-db
-LIBS= -lsqlite3 -laprutil-1 -lapr-1 -lexpat -liconv
-
-ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y)
-CONFIGURE_ARGS+= -disable-neon-version-check
-LIBS+= -lneon
-else
-CONFIGURE_ARGS+= --without-neon
-endif
-
-ifeq ($(ADK_PACKAGE_APR_THREADING),y)
-LIBS+= -pthread
-endif
-
-CONFIGURE_ENV+= LIBS='${LIBS}'
+CONFIGURE_ENV+= LIBS='-lsqlite3 -laprutil-1 -lapr-1 -lexpat -liconv'
INSTALL_TARGET:= external-install local-install
post-install: