summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Config.in8
-rw-r--r--jtools/ant/Makefile2
-rw-r--r--jtools/files.needed1
-rw-r--r--jtools/gcj/Makefile4
-rw-r--r--jtools/jamvm/Makefile7
-rw-r--r--jtools/jikes/Makefile2
-rw-r--r--jtools/openjdk/Makefile4
-rw-r--r--mk/build.mk3
-rw-r--r--mk/kernel-ver.mk12
-rw-r--r--package/orbit2/Makefile2
-rw-r--r--scripts/scan-pkgs.sh11
11 files changed, 34 insertions, 22 deletions
diff --git a/Config.in b/Config.in
index 9fb096866..1e3911bc2 100644
--- a/Config.in
+++ b/Config.in
@@ -76,12 +76,12 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
choice
prompt "Kernel Version"
-config ADK_KERNEL_VERSION_2_6_39
- prompt "2.6.39"
+config ADK_KERNEL_VERSION_2_6_39_4
+ prompt "2.6.39.4"
boolean
-config ADK_KERNEL_VERSION_3_0_4
- prompt "3.0.4"
+config ADK_KERNEL_VERSION_3_0_8
+ prompt "3.0.8"
boolean
endchoice
diff --git a/jtools/ant/Makefile b/jtools/ant/Makefile
index 537668a21..06a7f750c 100644
--- a/jtools/ant/Makefile
+++ b/jtools/ant/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= ant
PKG_VERSION:= 1.8.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa
+PKG_MD5SUM:= 0d9e108afcd15b820150b8085c96d2b1
PKG_SITES:= http://www.apache.org/dist/ant/source/
DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
diff --git a/jtools/files.needed b/jtools/files.needed
index 055a359fc..c6a1de4ba 100644
--- a/jtools/files.needed
+++ b/jtools/files.needed
@@ -9,4 +9,3 @@ XTest.h;libXtst
freetype.h;freetype
asoundlib.h;libasound
ffi.h;libffi
-Xproto.h;libXp
diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index 45302e723..429574c7c 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -13,7 +13,7 @@ DISTFILES:= gcc-$(PKG_VERSION).tar.bz2
WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION}
include ../rules.mk
-GCJ_ENV+= JAR=no
+GCJ_ENV+= "JAR=no LDFLAGS=-liconv"
install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
@@ -29,6 +29,8 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
--with-mpc=$(STAGING_HOST_DIR) \
--with-mpfr=$(STAGING_HOST_DIR) \
--with-gmp=$(STAGING_HOST_DIR) \
+ --disable-nls \
+ --without-libiconv-prefix \
--disable-libmudflap \
--disable-libgomp \
--disable-biarch \
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
index a85b2d6c8..1775ff5aa 100644
--- a/jtools/jamvm/Makefile
+++ b/jtools/jamvm/Makefile
@@ -6,14 +6,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= jamvm
PKG_VERSION:= 1.5.4
PKG_RELEASE:= 2
-PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa
+PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/}
-ifeq (Darwin,${OStype})
-CC_FOR_BUILD:=${CC_FOR_BUILD} -m32
-CXX_FOR_BUILD:=${CXX_FOR_BUILD} -m32
-endif
-
include ../rules.mk
install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
diff --git a/jtools/jikes/Makefile b/jtools/jikes/Makefile
index c26a0f45b..1d619c8eb 100644
--- a/jtools/jikes/Makefile
+++ b/jtools/jikes/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= jikes
PKG_VERSION:= 1.22
PKG_RELEASE:= 1
-PKG_MD5SUM:= 14d4bdfac236e347d806c6743dba48c6
+PKG_MD5SUM:= cda958c7fef6b43b803e1d1ef9afcb85
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile
index 12426a8d2..600db055b 100644
--- a/jtools/openjdk/Makefile
+++ b/jtools/openjdk/Makefile
@@ -59,7 +59,9 @@ $(WRKDIST)/.extract: $(WRKDIST)/.extract_done
cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
mkdir -p ${WRKBUILD}/drops
cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip ${WRKBUILD}/drops
- cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/*.patch
+ cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/openjdk.patch
+ cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/iconv.patch
+ cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/remove-libnsl.patch
touch $@
$(WRKDIST)/.configured: ${WRKDIST}/.extract
diff --git a/mk/build.mk b/mk/build.mk
index 886ecaf09..b7d4d08d5 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -18,6 +18,9 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_USE_CCACHE=n \
ADK_PACKAGE_LIBFFMPEG_WITH_VP8=n \
ADK_PACKAGE_LM_SENSORS_DETECT=n \
+ ADK_PACKAGE_PACEMAKER_MGMTD=n \
+ ADK_PACKAGE_OPENJDK=n \
+ ADK_PACKAGE_CLASSPATH=n \
ADK_PACKAGE_GRUB=n \
ADK_PACKAGE_BASE_FILES=y \
ADK_PACKAGE_CRYPTINIT=n \
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 6a6202fbc..5b6a3d06f 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -1,10 +1,10 @@
-ifeq ($(ADK_KERNEL_VERSION_2_6_39),y)
-KERNEL_VERSION:= 2.6.39
+ifeq ($(ADK_KERNEL_VERSION_2_6_39_4),y)
+KERNEL_VERSION:= 2.6.39.4
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= 1aab7a741abe08d42e8eccf20de61e05
+KERNEL_MD5SUM:= a17c748c2070168f1e784e9605ca043d
endif
-ifeq ($(ADK_KERNEL_VERSION_3_0_4),y)
-KERNEL_VERSION:= 3.0.4
+ifeq ($(ADK_KERNEL_VERSION_3_0_8),y)
+KERNEL_VERSION:= 3.0.8
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= dff86c657cabe813bda84c72bfb93ae8
+KERNEL_MD5SUM:= eac4d398a0ecd98214487cd47a228998
endif
diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile
index c30fa35ed..a7a682b89 100644
--- a/package/orbit2/Makefile
+++ b/package/orbit2/Makefile
@@ -26,7 +26,7 @@ $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
$(eval $(call PKG_template,ORBIT2_DEV,orbit2-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ORBIT2_DEV},${PKGSC_ORBIT2_DEV}))
CFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --cflags)
-CFLAGS_FOR_BUILD+= -I/usr/local/include
+CFLAGS_FOR_BUILD+= -I/usr/local/include -I/usr/include
LDFLAGS_FOR_BUILD+= $(shell ${BUILD_LIBIDL_CONFIG} --libs)
LDFLAGS_FOR_BUILD+= -lgmodule-2.0
CONFIGURE_ENV+= ac_cv_alignof_CORBA_octet=1 \
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 67703df58..2eeed09dd 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -149,6 +149,10 @@ if [[ -n $ADK_PACKAGE_GLIB ]]; then
NEED_GETTEXT="$NEED_GETTEXT glib"
fi
+if [[ -n $ADK_PACKAGE_CONSOLEKIT ]]; then
+ NEED_DBUSGLIB="$NEED_DBUSGLIB consolekit"
+fi
+
if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_100DPI ]]; then
NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi"
fi
@@ -393,6 +397,13 @@ if [[ -n $NEED_XSLTPROC ]]; then
fi
fi
+if [[ -n $NEED_DBUSGLIB ]]; then
+ if ! which dbus-binding-tool >/dev/null 2>&1; then
+ echo >&2 You need dbus-binding-tool to build $NEED_DBUSGLIB
+ out=1
+ fi
+fi
+
if [[ -n $NEED_PYTHON ]]; then
if ! which python >/dev/null 2>&1; then
if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 21:45:06 +0000