summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Config.in4
-rw-r--r--package/Depends.mk4
-rw-r--r--package/Makefile1
-rw-r--r--package/busybox/config/Config.in3
-rwxr-xr-xpackage/ctorrent/Makefile1
-rw-r--r--package/gcc/Config.in2
-rw-r--r--package/gcc/Makefile23
-rw-r--r--package/gmp/Makefile7
-rw-r--r--package/libSM/Config.in1
-rw-r--r--package/libXpm/Makefile2
-rw-r--r--package/libelf/Makefile9
-rw-r--r--package/libfontenc/Config.in1
-rw-r--r--package/libnl/Config.in4
-rw-r--r--package/libnl/patches/patch-include_netlink-local_h10
-rw-r--r--package/mpd/Makefile2
-rw-r--r--package/mpd/patches/patch-src_listen_h11
-rw-r--r--package/mpfr/Makefile1
-rw-r--r--package/mpfr/patches/patch-mpfr-longlong_h48
-rw-r--r--package/openldap/Makefile2
-rw-r--r--package/rrs/Makefile2
-rw-r--r--package/rtorrent/patches/patch-src_command_network_cc11
-rw-r--r--package/rtorrent/patches/patch-src_display_utils_h11
-rw-r--r--package/rtorrent/patches/patch-src_rpc_parse_cc5
-rw-r--r--package/rtorrent/patches/patch-src_rpc_scgi_task_cc11
-rw-r--r--package/rtorrent/patches/patch-src_utils_lockfile_cc11
-rw-r--r--package/ruby/Config.in4
-rw-r--r--package/uclibc/Makefile4
-rw-r--r--package/weechat/Makefile1
-rw-r--r--package/xf86-video-geode/Config.in6
-rw-r--r--package/xf86-video-geode/Makefile27
-rw-r--r--package/xf86-video-geode/ipkg/xf86-video-geode.control4
-rw-r--r--package/xorg-server/Config.in13
32 files changed, 210 insertions, 36 deletions
diff --git a/package/Config.in b/package/Config.in
index d2d291b06..3db9a7631 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -352,7 +352,7 @@ endmenu
menu "Programming"
source "package/binutils/Config.in"
source "package/cxxtools/Config.in"
-#source "package/gcc/Config.in"
+source "package/gcc/Config.in"
source "package/haserl/Config.in"
source "package/jamvm/Config.in"
source "package/lua/Config.in"
@@ -456,6 +456,7 @@ endmenu
menu "X"
depends ADK_XORG
source "package/xorg-server/Config.in"
+source "package/xf86-video-geode/Config.in"
menu "X Libraries"
source "package/libICE/Config.in"
@@ -474,7 +475,6 @@ source "package/libXpm/Config.in"
source "package/libXt/Config.in"
source "package/pixman/Config.in"
source "package/xf86dga/Config.in"
-source "package/xproto/Config.in"
endmenu
endmenu
diff --git a/package/Depends.mk b/package/Depends.mk
index d361acb20..a606e3756 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -227,8 +227,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/Makefile b/package/Makefile
index f44626806..079405854 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -399,6 +399,7 @@ package-$(ADK_PACKAGE_XFSPROGS) += xfsprogs
package-$(ADK_PACKAGE_XINETD) += xinetd
package-$(ADK_PACKAGE_XCMISCPROTO) += xcmiscproto
package-$(ADK_PACKAGE_XEXTPROTO) += xextproto
+package-$(ADK_PACKAGE_XF86_VIDEO_GEODE) += xf86-video-geode
package-$(ADK_PACKAGE_XF86DGA) += xf86dga
package-$(ADK_PACKAGE_XF86DGAPROTO) += xf86dgaproto
package-$(ADK_PACKAGE_XPROTO) += xproto
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index b8894d4c5..91cf58e81 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -599,7 +599,8 @@ source package/busybox/config/networking/Config.in
source package/busybox/config/printutils/Config.in
source package/busybox/config/mailutils/Config.in
source package/busybox/config/procps/Config.in
-source package/busybox/config/runit/Config.in
+# disable, gcc 4.4.0 problems
+#source package/busybox/config/runit/Config.in
source package/busybox/config/selinux/Config.in
source package/busybox/config/shell/Config.in
source package/busybox/config/sysklogd/Config.in
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index 44436bb7f..5c6221b08 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -30,6 +30,7 @@ ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++
TLDFLAGS+= -lgcc_s -luClibc++ -lc -lm -nodefaultlibs
endif
+
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
INSTALL_STYLE= auto
diff --git a/package/gcc/Config.in b/package/gcc/Config.in
index 2d32d4491..be3446b96 100644
--- a/package/gcc/Config.in
+++ b/package/gcc/Config.in
@@ -1,5 +1,5 @@
config ADK_PACKAGE_GCC
- prompt "gcc.......................... GNU Compiler Collection"
+ prompt "gcc............................... GNU Compiler Collection"
tristate
default n
select ADK_PACKAGE_LIBGMP
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index e1acd7309..d1252396f 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -14,21 +14,36 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TCFLAGS:= ''
+TCPPFLAGS:= ''
CONFIGURE_STYLE= gnu
+ifeq ($(ADK_LINUX_MIPS64_LEMOTE),y)
+CONFIGURE_ARGS+= --with-abi=64
+endif
CONFIGURE_ARGS+= --enable-languages=c \
- --enable-shared \
+ --libexecdir=/usr/lib \
+ --host=$(REAL_GNU_TARGET_NAME) \
+ --target=$(REAL_GNU_TARGET_NAME) \
--disable-__cxa_atexit \
+ --without-headers \
--with-gnu-ld \
--disable-libssp \
--disable-nls \
--disable-libmudflap \
--disable-libgomp \
--disable-multilib
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+ALL_TARGET:= all-gcc all-target-libgcc
+INSTALL_STYLE:= auto
+INSTALL_TARGET:= install-gcc install-target-libgcc
post-install:
- ${INSTALL_DIR} ${IDIR_GCC}/usr/bin
+ ${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/
+ ${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/
+ ${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib
+ rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/include-fixed
+ rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index 3601133ac..14e24ebf0 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -4,16 +4,11 @@
# material, please see the LICENCE file in the top-level directory.
include ${TOPDIR}/rules.mk
+include ${TOPDIR}/toolchain/gmp/Makefile.inc
-PKG_NAME:= gmp
-PKG_VERSION:= 4.2.2
-PKG_RELEASE:= 1
-PKG_MD5SUM:= 7ce52531644e6d12f16911b7e3151f3f
PKG_DESCR:= GNU multiprecision arithmetic library
PKG_SECTION:= libs
PKG_URL:= http://gmplib.org
-PKG_SITES:= ${MASTER_SITE_GNU:=gmp/}
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
diff --git a/package/libSM/Config.in b/package/libSM/Config.in
index 650563a61..e247147ee 100644
--- a/package/libSM/Config.in
+++ b/package/libSM/Config.in
@@ -2,5 +2,6 @@ config ADK_PACKAGE_LIBSM
prompt "libSM................................... X library"
tristate
default n
+ select ADK_PACKAGE_LIBUUID
help
http://www.x.org
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile
index d1940d9ce..a766bc76e 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -20,9 +20,9 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
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 4952c5b98..40533daf1 100644
--- a/package/libelf/Makefile
+++ b/package/libelf/Makefile
@@ -6,7 +6,7 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libelf
-PKG_VERSION:= 0.8.9
+PKG_VERSION:= 0.8.11
PKG_RELEASE:= 1
PKG_MD5SUM:= 11904a77b948bcfab671e80100b6098d
PKG_SITES:= http://www.mr511.de/software/
@@ -17,12 +17,9 @@ $(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
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/libfontenc/Config.in b/package/libfontenc/Config.in
index 1cf91edba..966bd7d22 100644
--- a/package/libfontenc/Config.in
+++ b/package/libfontenc/Config.in
@@ -1,7 +1,6 @@
config ADK_PACKAGE_LIBFONTENC
prompt "libfontenc.............................. X font encoding library"
tristate
- select ADK_PACKAGE_XPROTO
select ADK_PACKAGE_ZLIB
default n
help
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
index 11929f837..02dc66130 100644
--- a/package/libnl/patches/patch-include_netlink-local_h
+++ b/package/libnl/patches/patch-include_netlink-local_h
@@ -1,6 +1,14 @@
$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-28 23:19:45.636686415 +0200
++++ libnl-1.1/include/netlink-local.h 2009-05-29 00:17:59.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <sys/socket.h>
+ #include <inttypes.h>
+ #include <assert.h>
++#include <limits.h>
+
+ #include <arpa/inet.h>
+ #include <netdb.h>
@@ -337,7 +337,7 @@ static inline int nl_cb_call(struct nl_c
}
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index b18836d8d..83cc3ad49 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -46,7 +46,7 @@ $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_D
CONFIGURE_STYLE:= gnu
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
-XAKE_FLAGS+= MPD_CFLAGS=''
+XAKE_FLAGS+= MPD_CFLAGS='-D_GNU_SOURCE'
CONFIGURE_ARGS+= \
--enable-alsa \
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 <sys/select.h>
++#include <linux/socket.h>
+
+ extern int boundPort;
+
diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile
index 900cbee9c..5d1c86f47 100644
--- a/package/mpfr/Makefile
+++ b/package/mpfr/Makefile
@@ -20,5 +20,6 @@ INSTALL_STYLE= auto
post-install:
${INSTALL_DIR} ${IDIR_MPFR}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libmpfr.so.* ${IDIR_MPFR}/usr/lib/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mpfr/patches/patch-mpfr-longlong_h b/package/mpfr/patches/patch-mpfr-longlong_h
new file mode 100644
index 000000000..7bf1567ee
--- /dev/null
+++ b/package/mpfr/patches/patch-mpfr-longlong_h
@@ -0,0 +1,48 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- mpfr-2.4.1.orig/mpfr-longlong.h 2009-02-20 10:43:17.000000000 +0100
++++ mpfr-2.4.1/mpfr-longlong.h 2009-05-29 15:11:21.000000000 +0200
+@@ -1011,10 +1011,19 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
+ #endif /* __m88000__ */
+
+ #if defined (__mips) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if __GMP_GNUC_PREREQ (4,4)
++#define umul_ppmm(w1, w0, u, v) \
++ do { \
++ UDItype __ll = (UDItype)(u) * (v); \
++ w1 = __ll >> 32; \
++ w0 = __ll; \
++ } while (0)
++#endif
++#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
+-#else
++#endif
++#if !defined (umul_ppmm)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1" \
+ : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
+@@ -1024,10 +1033,20 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
+ #endif /* __mips */
+
+ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if __GMP_GNUC_PREREQ (4,4)
++#define umul_ppmm(w1, w0, u, v) \
++ do { \
++ typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \
++ __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \
++ w1 = __ll >> 64; \
++ w0 = __ll; \
++ } while (0)
++#endif
++#if !defined (umul_ppmm) && __GMP_GNUC_PREREQ (2,7)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
+-#else
++#endif
++#if !defined (umul_ppmm)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1" \
+ : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index a92bac9b3..a42da2b16 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -72,7 +72,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/rrs/Makefile b/package/rrs/Makefile
index acb6d8354..9404034f4 100644
--- a/package/rrs/Makefile
+++ b/package/rrs/Makefile
@@ -16,6 +16,7 @@ PKG_SITES:= http://www.cycom.se/uploads/36/19/
PKG_DEPENDS:= libopenssl zlib
PKG_DEPENDS_NOSSL:= zlib
+
ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y)
PKG_DEPENDS+= uclibc++
PKG_DEPENDS_NOSSL+= uclibc++
@@ -37,7 +38,6 @@ PKG_CFLAGS=
PKG_LDFLAGS=-shared
endif
-
do-configure:
ifneq (${ADK_PACKAGE_RRS},)
${MAKE} -C ${WRKBUILD} \
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 <cstdio>
+ #include <functional>
+ #include <rak/address_info.h>
+ #include <rak/path.h>
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 <ctime>
++#include <cstdio>
+ #include <string>
+
+ 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 <locale>
++#include <cstdio>
+#include <cstring>
#include <rak/path.h>
#include <torrent/exceptions.h>
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 <cstdio>
+ #include <rak/error_number.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
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 <algorithm>
+ #include <cctype>
+ #include <cerrno>
++#include <cstdio>
+ #include <cstring>
+ #include <sstream>
+ #include <fcntl.h>
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.
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 07cf10faa..707d62b4a 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -31,11 +31,13 @@ endif
$(CP) $(STAGING_DIR)/lib/$$file.so.* $(IDIR_UCLIBC)/lib/; \
$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_UCLIBC)/lib/; \
done
- # create ld.so link for ldd
+ # create links for ldd / gcc
ifneq (${CPU_ARCH},x86_64)
cd $(IDIR_UCLIBC)/lib && ln -sf ld-uClibc.so.0 ld.so
else
cd $(IDIR_UCLIBC)/lib && ln -sf ld64-uClibc.so.0 ld.so
endif
+ cd $(IDIR_UCLIBC)/lib && ln -sf libc.so.0 libc.so
+ cd $(IDIR_UCLIBC)/lib && ln -sf libgcc_s.so.1 libgcc_s.so
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index 73428d536..9b2fef088 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -25,7 +25,6 @@ ifeq (${ADK_COMPILE_WEECHAT_WITH_LUA},y)
PKG_DEPENDS+= liblua
endif
-
$(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq (${ADK_COMPILE_WEECHAT_WITH_TLS},y)
diff --git a/package/xf86-video-geode/Config.in b/package/xf86-video-geode/Config.in
new file mode 100644
index 000000000..1505d48f1
--- /dev/null
+++ b/package/xf86-video-geode/Config.in
@@ -0,0 +1,6 @@
+config ADK_PACKAGE_XF86_VIDEO_GEODE
+ prompt "xf86-video-geode........................... X11 driver for AMD Geode"
+ tristate
+ default n
+ help
+ http://www.x.org
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
new file mode 100644
index 000000000..0c57d851f
--- /dev/null
+++ b/package/xf86-video-geode/Makefile
@@ -0,0 +1,27 @@
+# $Id$
+#-
+# 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:= xf86-video-geode
+PKG_VERSION:= 2.11.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= dc9cbe88f38f82e27dbfb66f9f99fc98
+MASTER_SITES:= http://xorg.freedesktop.org/releases/individual/driver/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE)))
+
+CONFIGURE_STYLE= gnu
+BUILD_STYLE= auto
+INSTALL_STYLE= auto
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers
+ ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \
+ ${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-video-geode/ipkg/xf86-video-geode.control b/package/xf86-video-geode/ipkg/xf86-video-geode.control
new file mode 100644
index 000000000..4c3537a0b
--- /dev/null
+++ b/package/xf86-video-geode/ipkg/xf86-video-geode.control
@@ -0,0 +1,4 @@
+Package: xf86-video-geode
+Priority: optional
+Section: x11
+Description: X.org library
diff --git a/package/xorg-server/Config.in b/package/xorg-server/Config.in
index f9cc2a6a8..b3dc66880 100644
--- a/package/xorg-server/Config.in
+++ b/package/xorg-server/Config.in
@@ -4,5 +4,18 @@ config ADK_PACKAGE_XORG_SERVER
default n
select ADK_PACKAGE_LIBXKBFILE
select ADK_PACKAGE_LIBX11
+ select ADK_PACKAGE_LIBICE
+ select ADK_PACKAGE_LIBSM
+ select ADK_PACKAGE_LIBXEXT
+ select ADK_PACKAGE_LIBXFONT
+ select ADK_PACKAGE_LIBFONTENC
+ select ADK_PACKAGE_LIBPCIACCESS
+ select ADK_PACKAGE_LIBXAU
+ select ADK_PACKAGE_LIBXAW
+ select ADK_PACKAGE_LIBXMU
+ select ADK_PACKAGE_LIBXPM
+ select ADK_PACKAGE_LIBXT
+ select ADK_PACKAGE_PIXMAN
+ select ADK_PACKAGE_XF86DGA
help
http://www.x.org