From 7047a0b2b2d18d51594cad92d5356bd626da063d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 29 May 2009 13:13:17 +0200 Subject: add lemote / loongson2f target support (no runtime tests yet) - update glibc to latest version (GIT), tarball includes glibc-ports needed for MIPS architecture - fix building of toolchain for mips64el glibc/uclibc - use /lib instead of /lib64 (no biarch support) - fix X11 dependencies in build system - fix glibc build errors for openldap, libnl, mpd and rtorrent - verified toolchain changes on alix1c --- package/Depends.mk | 4 ++-- package/libXpm/Makefile | 2 +- package/libelf/Makefile | 11 ++++------- package/libnl/Config.in | 4 ++-- package/libnl/patches/patch-include_netlink-local_h | 11 +++++++++++ package/mpd/Makefile | 2 +- package/mpd/patches/patch-src_listen_h | 11 +++++++++++ package/openldap/Makefile | 2 +- package/rtorrent/patches/patch-src_command_network_cc | 11 +++++++++++ package/rtorrent/patches/patch-src_display_utils_h | 11 +++++++++++ package/rtorrent/patches/patch-src_rpc_parse_cc | 5 +++-- package/rtorrent/patches/patch-src_rpc_scgi_task_cc | 11 +++++++++++ package/rtorrent/patches/patch-src_utils_lockfile_cc | 11 +++++++++++ package/ruby/Config.in | 4 ++-- 14 files changed, 82 insertions(+), 18 deletions(-) create mode 100644 package/libnl/patches/patch-include_netlink-local_h create mode 100644 package/mpd/patches/patch-src_listen_h create mode 100644 package/rtorrent/patches/patch-src_command_network_cc create mode 100644 package/rtorrent/patches/patch-src_display_utils_h create mode 100644 package/rtorrent/patches/patch-src_rpc_scgi_task_cc create mode 100644 package/rtorrent/patches/patch-src_utils_lockfile_cc (limited to 'package') diff --git a/package/Depends.mk b/package/Depends.mk index 6d30f7320..d60000e6b 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -229,8 +229,8 @@ wpa_supplicant-compile: openssl-compile endif wx200d-compile: postgresql-compile xfsprogs-compile: e2fsprogs-compile -libXxf86dga-compile: xf86dgaproto-compile -xf86dga-compile: libXxf86dga-compile +libXxf86dga-compile: xf86dgaproto-compile libXext-compile libXaw-compile +xf86dga-compile: libXxf86dga-compile xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixesproto-compile \ damageproto-compile scrnsaverproto-compile resourceproto-compile \ fontsproto-compile videoproto-compile compositeproto-compile \ diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile index 33ce075c1..c72904cf6 100644 --- a/package/libXpm/Makefile +++ b/package/libXpm/Makefile @@ -16,9 +16,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-$(PKG_RELEASE))) CONFIGURE_STYLE= gnu +CONFIGURE_ENV+= ac_cv_search_gettext=no BUILD_STYLE= auto INSTALL_STYLE= auto confprog -TCFLAGS+= -lintl post-install: ${INSTALL_DIR} ${IDIR_LIBXPM}/usr/lib diff --git a/package/libelf/Makefile b/package/libelf/Makefile index 8bf71926e..adc40759c 100644 --- a/package/libelf/Makefile +++ b/package/libelf/Makefile @@ -6,9 +6,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libelf -PKG_VERSION:= 0.8.9 +PKG_VERSION:= 0.8.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= 11904a77b948bcfab671e80100b6098d +PKG_MD5SUM:= e931910b6d100f6caa32239849947fbf MASTER_SITES:= http://www.mr511.de/software/ include ${TOPDIR}/mk/package.mk @@ -17,12 +17,9 @@ $(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= mr_cv_target_elf=yes \ - libelf_64bit=yes \ - libelf_cv_struct_elf64_ehdr=yes \ - libelf_cv_type_elf64_addr=no \ - libelf_cv_struct_elf64_rel=yes \ ac_cv_sizeof_long_long=8 -CONFIGURE_ARGS+= --enable-elf64=yes +CONFIGURE_ARGS+= --enable-elf64=yes \ + --disable-sanity-checks BUILD_STYLE= auto INSTALL_STYLE= confprog auto FAKE_FLAGS+= instroot="${WRKINST}" diff --git a/package/libnl/Config.in b/package/libnl/Config.in index 4d5e953a2..e91a31824 100644 --- a/package/libnl/Config.in +++ b/package/libnl/Config.in @@ -1,6 +1,6 @@ config ADK_PACKAGE_LIBNL - prompt "libnl........................... Tools for manipulating Linux Wireless cards" + prompt "libnl........................... netlink library" tristate default n help - Tools for configuring Wireless Adapters. + Netlink library. diff --git a/package/libnl/patches/patch-include_netlink-local_h b/package/libnl/patches/patch-include_netlink-local_h new file mode 100644 index 000000000..c32825b23 --- /dev/null +++ b/package/libnl/patches/patch-include_netlink-local_h @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100 ++++ libnl-1.1/include/netlink-local.h 2009-05-29 00:17:59.000000000 +0200 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 65baca748..d8118809a 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -18,7 +18,7 @@ $(eval $(call PKG_template,MPD,mpd,${PKG_VERSION}-${PKG_RELEASE})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto -XAKE_FLAGS+= MPD_CFLAGS='' +XAKE_FLAGS+= MPD_CFLAGS='-D_GNU_SOURCE' PKG_DEPENDS:= glib2 alsa-lib libcurl CONFIGURE_ARGS+= \ diff --git a/package/mpd/patches/patch-src_listen_h b/package/mpd/patches/patch-src_listen_h new file mode 100644 index 000000000..e14baa2bb --- /dev/null +++ b/package/mpd/patches/patch-src_listen_h @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- mpd-0.14.2.orig/src/listen.h 2009-02-13 17:12:00.000000000 +0100 ++++ mpd-0.14.2/src/listen.h 2009-05-29 00:49:32.000000000 +0200 +@@ -20,6 +20,7 @@ + #define MPD_LISTEN_H + + #include ++#include + + extern int boundPort; + diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 267b61d2b..ca3defa4a 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -60,7 +60,7 @@ CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes CONFIGURE_ARGS+= ${PKG_CONFIGURE_OPTIONS} BUILD_STYLE= auto INSTALL_STYLE= auto -XAKE_FLAGS+= STRIP="" +XAKE_FLAGS+= STRIP="" CPPFLAGS="-D_GNU_SOURCE" post-install: ${INSTALL_DIR} ${IDIR_LIBOPENLDAP}/etc/openldap diff --git a/package/rtorrent/patches/patch-src_command_network_cc b/package/rtorrent/patches/patch-src_command_network_cc new file mode 100644 index 000000000..5d0405ebe --- /dev/null +++ b/package/rtorrent/patches/patch-src_command_network_cc @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- rtorrent-0.8.2.orig/src/command_network.cc 2008-05-07 14:19:11.000000000 +0200 ++++ rtorrent-0.8.2/src/command_network.cc 2009-05-29 01:38:53.000000000 +0200 +@@ -36,6 +36,7 @@ + + #include "config.h" + ++#include + #include + #include + #include diff --git a/package/rtorrent/patches/patch-src_display_utils_h b/package/rtorrent/patches/patch-src_display_utils_h new file mode 100644 index 000000000..30f0eabe1 --- /dev/null +++ b/package/rtorrent/patches/patch-src_display_utils_h @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- rtorrent-0.8.2.orig/src/display/utils.h 2008-05-07 14:19:11.000000000 +0200 ++++ rtorrent-0.8.2/src/display/utils.h 2009-05-29 01:25:58.000000000 +0200 +@@ -38,6 +38,7 @@ + #define RTORRENT_DISPLAY_UTILS_H + + #include ++#include + #include + + namespace core { diff --git a/package/rtorrent/patches/patch-src_rpc_parse_cc b/package/rtorrent/patches/patch-src_rpc_parse_cc index a84b30475..09189e908 100644 --- a/package/rtorrent/patches/patch-src_rpc_parse_cc +++ b/package/rtorrent/patches/patch-src_rpc_parse_cc @@ -1,10 +1,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- rtorrent-0.8.2.orig/src/rpc/parse.cc 2008-05-07 14:19:10.000000000 +0200 -+++ rtorrent-0.8.2/src/rpc/parse.cc 2008-12-14 22:49:04.000000000 +0100 -@@ -37,6 +37,7 @@ ++++ rtorrent-0.8.2/src/rpc/parse.cc 2009-05-29 01:27:36.000000000 +0200 +@@ -37,6 +37,8 @@ #include "config.h" #include ++#include +#include #include #include diff --git a/package/rtorrent/patches/patch-src_rpc_scgi_task_cc b/package/rtorrent/patches/patch-src_rpc_scgi_task_cc new file mode 100644 index 000000000..f81092202 --- /dev/null +++ b/package/rtorrent/patches/patch-src_rpc_scgi_task_cc @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- rtorrent-0.8.2.orig/src/rpc/scgi_task.cc 2008-05-07 14:19:10.000000000 +0200 ++++ rtorrent-0.8.2/src/rpc/scgi_task.cc 2009-05-29 01:29:24.000000000 +0200 +@@ -36,6 +36,7 @@ + + #include "config.h" + ++#include + #include + #include + #include diff --git a/package/rtorrent/patches/patch-src_utils_lockfile_cc b/package/rtorrent/patches/patch-src_utils_lockfile_cc new file mode 100644 index 000000000..58eafdfc8 --- /dev/null +++ b/package/rtorrent/patches/patch-src_utils_lockfile_cc @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- rtorrent-0.8.2.orig/src/utils/lockfile.cc 2008-05-07 14:19:11.000000000 +0200 ++++ rtorrent-0.8.2/src/utils/lockfile.cc 2009-05-29 01:34:05.000000000 +0200 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/package/ruby/Config.in b/package/ruby/Config.in index 5fd97df7f..cf85ef70f 100644 --- a/package/ruby/Config.in +++ b/package/ruby/Config.in @@ -1,7 +1,7 @@ config ADK_PACKAGE_RUBY - prompt "ruby.............................. Asian Object-Oriented scripting language" + prompt "ruby.............................. Object-Oriented scripting language" tristate default n help - Ruby1.8 is the interpreter for the ruby language. + Ruby is the interpreter for the ruby language. -- cgit v1.2.3