summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/ConsoleKit/Makefile2
-rw-r--r--package/dbus-glib/Makefile3
-rw-r--r--package/dbus/patches/patch-configure21
-rw-r--r--package/glib/Makefile3
-rw-r--r--package/libmpc/Makefile11
-rw-r--r--package/mpfr/Makefile16
-rw-r--r--package/zip/Makefile34
-rw-r--r--target/config/Config.in2
-rw-r--r--target/mips64el/sys-available/lemote-yeelong1
-rw-r--r--target/mips64el/sys-available/qemu-mips64el1
-rw-r--r--target/mips64el/sys-available/toolchain-mips64el1
-rw-r--r--target/mips64el/target.mk2
12 files changed, 89 insertions, 8 deletions
diff --git a/package/ConsoleKit/Makefile b/package/ConsoleKit/Makefile
index 4480df4ef..178be1447 100644
--- a/package/ConsoleKit/Makefile
+++ b/package/ConsoleKit/Makefile
@@ -21,5 +21,7 @@ $(eval $(call PKG_template,CONSOLEKIT,consolekit,$(PKG_VERSION)-${PKG_RELEASE},$
consolekit-install:
$(INSTALL_DIR) $(IDIR_CONSOLEKIT)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libck-connector.so* \
+ $(IDIR_CONSOLEKIT)/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dbus-glib/Makefile b/package/dbus-glib/Makefile
index f998edca1..a937f5971 100644
--- a/package/dbus-glib/Makefile
+++ b/package/dbus-glib/Makefile
@@ -39,5 +39,8 @@ dbus-glib-dev-install:
$(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig
${CP} $(WRKINST)/usr/lib/pkgconfig/*.pc \
$(IDIR_DBUS_GLIB_DEV)/usr/lib/pkgconfig
+ $(INSTALL_DIR) $(IDIR_DBUS_GLIB_DEV)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/dbus-binding-tool \
+ $(IDIR_DBUS_GLIB_DEV)/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure
new file mode 100644
index 000000000..e5bce5132
--- /dev/null
+++ b/package/dbus/patches/patch-configure
@@ -0,0 +1,21 @@
+--- dbus-1.4.6.orig/configure 2011-02-17 21:06:57.000000000 +0100
++++ dbus-1.4.6/configure 2011-04-13 04:47:38.000000000 +0200
+@@ -19608,18 +19608,6 @@ if test "x$GCC" = "xyes"; then
+ ;;
+ esac
+
+- case " $CFLAGS " in
+- *[\ \ ]-fPIE[\ \ ]*) ;;
+- *) if test x$dbus_win = xno && cc_supports_flag -fPIE; then
+- PIE_CFLAGS="-fPIE"
+- if ld_supports_flag -z,relro; then
+- PIE_LDFLAGS="-pie -Wl,-z,relro"
+- else
+- PIE_LDFLAGS="-pie"
+- fi
+- fi
+- ;;
+- esac
+
+ ### Disabled warnings, and compiler flag overrides
+
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 4bd99944c..692e5c8af 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -72,5 +72,8 @@ glib-dev-install:
${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/lib/pkgconfig
${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
${IDIR_GLIB_DEV}/usr/lib/pkgconfig
+ ${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/glib-genmarshal \
+ ${IDIR_GLIB_DEV}/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libmpc/Makefile b/package/libmpc/Makefile
index 1d976b17e..4c92d1fb1 100644
--- a/package/libmpc/Makefile
+++ b/package/libmpc/Makefile
@@ -9,14 +9,19 @@ PKG_SECTION:= libs
PKG_BUILDDEP:= gmp mpfr
PKG_URL:= http://www.multiprecision.org/
-PKG_SUBPKGS:= LIBMPC
+PKG_SUBPKGS:= LIBMPC LIBMPC_DEV
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBMPC,libmpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBMPC_DEV,libmpc-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-post-install:
+libmpc-install:
${INSTALL_DIR} ${IDIR_LIBMPC}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libmpc.so* ${IDIR_LIBMPC}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libmpc.so* ${IDIR_LIBMPC}/usr/lib
+
+libmpc-dev-install:
+ ${INSTALL_DIR} ${IDIR_LIBMPC_DEV}/usr/include
+ ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBMPC_DEV}/usr/include
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile
index c350828a3..619988cc6 100644
--- a/package/mpfr/Makefile
+++ b/package/mpfr/Makefile
@@ -6,16 +6,24 @@ include ${TOPDIR}/toolchain/mpfr/Makefile.inc
PKG_DESCR:= multi precision library
PKG_SECTION:= libs
-PKG_URL:= http://www.mpfr.org
+PKG_URL:= http://www.mpfr.org/
+PKG_SUBPKGS:= MPFR MPFR_DEV
+PKGSC_MPFR_DEV:= devel
+PKGSD_MPFR_DEV:= mpfr headers
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MPFR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MPFR,mpfr,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MPFR_DEV,mpfr-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MPFR_DEV},${PKGSC_MPFR_DEV}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
-post-install:
+mpfr-install:
${INSTALL_DIR} ${IDIR_MPFR}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libmpfr.so* ${IDIR_MPFR}/usr/lib/
+ ${CP} ${WRKINST}/usr/lib/libmpfr.so* ${IDIR_MPFR}/usr/lib
+
+mpfr-dev-install:
+ ${INSTALL_DIR} ${IDIR_MPFR_DEV}/usr/include
+ $(CP) $(WRKINST)/usr/include/* ${IDIR_MPFR_DEV}/usr/include
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/zip/Makefile b/package/zip/Makefile
new file mode 100644
index 000000000..1cc0f8ec0
--- /dev/null
+++ b/package/zip/Makefile
@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:= zip
+PKG_VERSION:= 3.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 7b74551e63f8ee6aab6fbc86676c0d37
+PKG_DESCR:= zip compression utility
+PKG_SECTION:= archive
+PKG_URL:= http://www.info-zip.org/Zip.html
+PKG_SITES:= ftp://ftp.info-zip.org/pub/infozip/src/
+
+WRKDIST= $(WRKDIR)/$(PKG_NAME)30
+DISTFILES:= $(PKG_NAME)30.tgz
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,ZIP,zip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:= minimal
+INSTALL_STYLE:= manual
+
+XAKE_FLAGS+= GCC_HONOUR_COPTS=s
+CONFIGURE_PROG:= unix/configure
+MAKE_FILE:= unix/Makefile
+ALL_TARGET:= generic_gcc
+
+zip-install:
+ ${INSTALL_DIR} ${IDIR_ZIP}/usr/bin
+ ${CP} ${WRKBUILD}/zip ${IDIR_ZIP}/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/target/config/Config.in b/target/config/Config.in
index 33ae6f44f..265e339e8 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -176,6 +176,8 @@ config ADK_TARGET_CFLAGS
default "-mcpu=v8" if ADK_CPU_SPARC_V8
default "-m64 -mcpu=v9" if ADK_CPU_SPARC_V9
default "-march=loongson2f" if ADK_CPU_LOONGSON2F
+ default "-march=mips32" if ADK_CPU_MIPS32
+ default "-march=mips64" if ADK_CPU_MIPS64
default "-march=armv5te -mtune=arm926ej-s" if ADK_CPU_ARMV5
config ADK_TARGET_CMDLINE
diff --git a/target/mips64el/sys-available/lemote-yeelong b/target/mips64el/sys-available/lemote-yeelong
index 6eedb9ebc..f868d3913 100644
--- a/target/mips64el/sys-available/lemote-yeelong
+++ b/target/mips64el/sys-available/lemote-yeelong
@@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
select ADK_mips64el
select ADK_lemote_yeelong
select ADK_LINUX_64
+ select ADK_CPU_LOONGSON2F
select ADK_KERNEL_MACH_LOONGSON
select ADK_KERNEL_LEMOTE_MACH2F
select ADK_TARGET_WITH_USB_BOOT
diff --git a/target/mips64el/sys-available/qemu-mips64el b/target/mips64el/sys-available/qemu-mips64el
index 47818f392..bdc8ba76d 100644
--- a/target/mips64el/sys-available/qemu-mips64el
+++ b/target/mips64el/sys-available/qemu-mips64el
@@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64EL
bool "Qemu Emulator"
select ADK_mips64el
select ADK_qemu_mips64el
+ select ADK_CPU_MIPS64
select ADK_LINUX_64
select ADK_KERNEL_MIPS_MALTA
select ADK_HARDWARE_QEMU
diff --git a/target/mips64el/sys-available/toolchain-mips64el b/target/mips64el/sys-available/toolchain-mips64el
index a403df0cd..c64972736 100644
--- a/target/mips64el/sys-available/toolchain-mips64el
+++ b/target/mips64el/sys-available/toolchain-mips64el
@@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64EL
bool "Toolchain only"
select ADK_mips64el
select ADK_toolchain_mips64el
+ select ADK_CPU_MIPS64
select ADK_TOOLCHAIN_ONLY
select ADK_LINUX_64
help
diff --git a/target/mips64el/target.mk b/target/mips64el/target.mk
index 2057c77fb..b45a49460 100644
--- a/target/mips64el/target.mk
+++ b/target/mips64el/target.mk
@@ -2,4 +2,4 @@ include $(TOPDIR)/mk/kernel-ver.mk
ARCH:= mips
CPU_ARCH:= mips64el
TARGET_OPTIMIZATION:= -Os -pipe
-TARGET_CFLAGS_ARCH:= -march=mips64 -mabi=64
+TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) -mabi=64
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-28 19:00:56 +0000