summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/libX11/Makefile1
-rw-r--r--package/libX11/patches/patch-src_util_Makefile_in13
-rw-r--r--package/openjdk8/Makefile4
-rw-r--r--package/openjdk8/files/openadk.patch123
-rw-r--r--target/mips/systems/mikrotik-rb5322
5 files changed, 142 insertions, 1 deletions
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 26a172f7c..b90f52885 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -26,6 +26,7 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call HOST_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE}))
$(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+XAKE_FLAGS+= V=1
CONFIGURE_ARGS+= --enable-xlocale \
--disable-specs \
--disable-xf86bigfont \
diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in
new file mode 100644
index 000000000..8a194f2d1
--- /dev/null
+++ b/package/libX11/patches/patch-src_util_Makefile_in
@@ -0,0 +1,13 @@
+--- libX11-1.6.3.orig/src/util/Makefile.in 2015-03-09 23:29:02.000000000 +0100
++++ libX11-1.6.3/src/util/Makefile.in 2016-01-08 10:43:16.257572082 +0100
+@@ -348,9 +348,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = \
+- $(X11_CFLAGS) \
+- $(CWARNFLAGS)
++AM_CFLAGS =
+
+ AM_CPPFLAGS = \
+ -I$(top_srcdir)/include
diff --git a/package/openjdk8/Makefile b/package/openjdk8/Makefile
index aa3f2984a..5b482fee1 100644
--- a/package/openjdk8/Makefile
+++ b/package/openjdk8/Makefile
@@ -69,10 +69,12 @@ CONFIGURE_ENV:= BUILD_CC=/usr/bin/gcc \
ac_cv_path_POTENTIAL_CXX=$(TARGET_CXX) \
LD=$(TARGET_CC) \
OBJCOPY='$(TARGET_CROSS)objcopy' \
+ STRIP='$(TARGET_CROSS)strip' \
LIBFFI_CFLAGS="$(TARGET_CPPFLAGS)" \
LIBFFI_LIBS="$(TARGET_LDFLAGS) -lffi"
XAKE_FLAGS+= LD=$(TARGET_CC) \
+ STRIP='$(TARGET_CROSS)strip' \
BUILD_CC=$(HOST_CC) \
BUILD_LD=$(HOST_CC) \
WARNINGS_ARE_ERRORS='' \
@@ -103,6 +105,8 @@ post-extract:
PATH=$(HOST_PATH) sed -e 's|@abs_top_srcdir@|$(WRKDIST)|g' -e '/^patch.*/d' fsg.sh.in > fsg.sh; \
${BASH} fsg.sh; \
)
+ cat $(WRKDIST)/openjdk/common/autoconf/configure.ac | PATH=$(HOST_PATH) sed -e "s|@DATE_WHEN_GENERATED@|`LC_ALL=C date +%s`|" | $(STAGING_HOST_DIR)/usr/bin/autoconf \
+ -W all -I$(WRKDIST)/openjdk/common/autoconf - > $(WRKDIST)/openjdk/common/autoconf/generated-configure.sh
openjdk8-install:
$(INSTALL_DIR) $(IDIR_OPENJDK8)/usr/bin
diff --git a/package/openjdk8/files/openadk.patch b/package/openjdk8/files/openadk.patch
index 2f8787890..c7e93ca0e 100644
--- a/package/openjdk8/files/openadk.patch
+++ b/package/openjdk8/files/openadk.patch
@@ -1,3 +1,126 @@
+diff -Nur openjdk.orig/common/autoconf/platform.m4 openjdk/common/autoconf/platform.m4
+--- openjdk.orig/common/autoconf/platform.m4 2015-12-23 01:50:32.000000000 +0100
++++ openjdk/common/autoconf/platform.m4 2016-01-08 17:54:55.814451099 +0100
+@@ -36,25 +36,85 @@
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
+ ;;
+- i?86)
++ x86|i?86)
+ VAR_CPU=x86
+ VAR_CPU_ARCH=x86
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=little
+ ;;
++ alpha*)
++ VAR_CPU=alpha
++ VAR_CPU_ARCH=alpha
++ VAR_CPU_BITS=64
++ VAR_CPU_ENDIAN=little
++ ;;
++ arm*eb)
++ VAR_CPU=armeb
++ VAR_CPU_ARCH=arm
++ VAR_CPU_BITS=32
++ VAR_CPU_ENDIAN=big
++ ;;
+ arm*)
+ VAR_CPU=arm
+ VAR_CPU_ARCH=arm
+ VAR_CPU_BITS=32
+ VAR_CPU_ENDIAN=little
+ ;;
++ aarch64eb)
++ VAR_CPU=aarch64eb
++ VAR_CPU_ARCH=aarch64
++ VAR_CPU_BITS=64
++ VAR_CPU_ENDIAN=big
++ ;;
+ aarch64)
+ VAR_CPU=aarch64
+ VAR_CPU_ARCH=aarch64
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
+ ;;
+- powerpc)
++ m68k)
++ VAR_CPU=m68k
++ VAR_CPU_ARCH=m68k
++ VAR_CPU_BITS=32
++ VAR_CPU_ENDIAN=big
++ ;;
++ mips)
++ VAR_CPU=mips
++ VAR_CPU_ARCH=mips
++ VAR_CPU_BITS=32
++ VAR_CPU_ENDIAN=big
++ ;;
++ mipsel)
++ VAR_CPU=mipsel
++ VAR_CPU_ARCH=mipsel
++ VAR_CPU_BITS=32
++ VAR_CPU_ENDIAN=little
++ ;;
++ mipsn32)
++ VAR_CPU=mipsn32
++ VAR_CPU_ARCH=mipsn32
++ VAR_CPU_BITS=32
++ VAR_CPU_ENDIAN=big
++ ;;
++ mipsn32el)
++ VAR_CPU=mipsn32el
++ VAR_CPU_ARCH=mipsn32el
++ VAR_CPU_BITS=32
++ VAR_CPU_ENDIAN=little
++ ;;
++ mips64)
++ VAR_CPU=mips64
++ VAR_CPU_ARCH=mips64
++ VAR_CPU_BITS=64
++ VAR_CPU_ENDIAN=big
++ ;;
++ mips64el)
++ VAR_CPU=mips64el
++ VAR_CPU_ARCH=mips64el
++ VAR_CPU_BITS=64
++ VAR_CPU_ENDIAN=little
++ ;;
++ powerpc|ppc)
+ VAR_CPU=ppc
+ VAR_CPU_ARCH=ppc
+ VAR_CPU_BITS=32
+@@ -66,12 +126,18 @@
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=big
+ ;;
+- powerpc64le)
++ powerpc64le|ppc64le)
+ VAR_CPU=ppc64
+ VAR_CPU_ARCH=ppc
+ VAR_CPU_BITS=64
+ VAR_CPU_ENDIAN=little
+ ;;
++ sh*)
++ VAR_CPU=sh
++ VAR_CPU_ARCH=sh
++ VAR_CPU_BITS=32
++ VAR_CPU_ENDIAN=little
++ ;;
+ s390)
+ VAR_CPU=s390
+ VAR_CPU_ARCH=s390
+@@ -371,6 +437,11 @@
+
+ # ZERO_ARCHDEF is used to enable architecture-specific code
+ case "${OPENJDK_TARGET_CPU}" in
++ alpha*) ZERO_ARCHDEF=ALPHA ;;
++ m68k) ZERO_ARCHDEF=M68K ;;
++ mips|mipsn32|mips64) ZERO_ARCHDEF=MIPS ;;
++ mipsel|mipsn32el|mips64el) ZERO_ARCHDEF=MIPSEL ;;
++ sh*) ZERO_ARCHDEF=sh ;;
+ ppc) ZERO_ARCHDEF=PPC32 ;;
+ ppc64) ZERO_ARCHDEF=PPC64 ;;
+ s390*) ZERO_ARCHDEF=S390 ;;
diff -Nur openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp
--- openjdk.orig/hotspot/src/cpu/zero/vm/entry_zero.hpp 2015-12-23 01:50:46.000000000 +0100
+++ openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp 2016-01-06 11:43:50.108091228 +0100
diff --git a/target/mips/systems/mikrotik-rb532 b/target/mips/systems/mikrotik-rb532
index 62785260d..d15a37908 100644
--- a/target/mips/systems/mikrotik-rb532
+++ b/target/mips/systems/mikrotik-rb532
@@ -1,6 +1,6 @@
config ADK_TARGET_SYSTEM_MIKROTIK_RB532
bool "Mikrotik Routerboard 532"
- select ADK_CPU_MIPS32
+ select ADK_CPU_MIPS32R2
select ADK_TARGET_LITTLE_ENDIAN
select ADK_TARGET_WITH_SERIAL
select ADK_TARGET_WITH_MINIPCI
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 10:46:57 +0000