diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/eglibc/files/libc.so.mips | 5 | ||||
| -rw-r--r-- | package/gcc/Makefile | 21 | ||||
| -rw-r--r-- | package/gcc/patches/mirbsd-compat.patch | 12 | ||||
| -rw-r--r-- | package/gcc/patches/no-lib64.patch | 47 | ||||
| -rw-r--r-- | package/git/Makefile | 2 | ||||
| -rw-r--r-- | package/mksh/Makefile | 4 | ||||
| -rw-r--r-- | package/mksh/patches/patch-dot_mkshrc | 6 | ||||
| -rw-r--r-- | package/strace/patches/patch-syscall_c | 13 |
8 files changed, 103 insertions, 7 deletions
diff --git a/package/eglibc/files/libc.so.mips b/package/eglibc/files/libc.so.mips new file mode 100644 index 000000000..6165d3e9c --- /dev/null +++ b/package/eglibc/files/libc.so.mips @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-tradlittlemips) + GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld.so.1 ) ) diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 20e99fff8..3c6e0b701 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -10,14 +10,32 @@ PKG_OPTS:= noremove PKG_DEPENDS:= libgmp mpfr PKG_BUILDDEP+= gmp mpfr +ifeq ($(ADK_TARGET_LIB_UCLIBC),y) +PKG_DEPENDS:= uclibc-dev +PKG_BUILDDEP+= uclibc +endif +ifeq ($(ADK_TARGET_LIB_EGLIBC),y) +PKG_DEPENDS:= eglibc-dev +PKG_BUILDDEP+= eglibc +endif +ifeq ($(ADK_TARGET_LIB_GLIBC),y) +PKG_DEPENDS:= glibc-dev +PKG_BUILDDEP+= glibc +endif + PKG_HOST_DEPENDS:= !freebsd include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,GCC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TCFLAGS:= '' TCPPFLAGS:= '' + +ifeq ($(ADK_LINUX_64),y) +CONFIGURE_ARGS+= --with-abi=64 +endif + CONFIGURE_ARGS+= --enable-languages=c,c++ \ --host=$(REAL_GNU_TARGET_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ @@ -40,6 +58,7 @@ post-install: ${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/g++ ${IDIR_GCC}/usr/bin/ cd ${IDIR_GCC}/usr/bin/ && ln -sf g++ c++ + cd ${IDIR_GCC}/usr/bin/ && ln -sf gcc cc ${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/ ${CP} ${WRKINST}/usr/lib/libstdc++*so* ${IDIR_GCC}/usr/lib/ ${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/ diff --git a/package/gcc/patches/mirbsd-compat.patch b/package/gcc/patches/mirbsd-compat.patch new file mode 100644 index 000000000..2f3ea0c87 --- /dev/null +++ b/package/gcc/patches/mirbsd-compat.patch @@ -0,0 +1,12 @@ +diff -Nur gcc-4.4.2.orig/gcc/configure gcc-4.4.2/gcc/configure +--- gcc-4.4.2.orig/gcc/configure Tue Mar 24 18:45:39 2009 ++++ gcc-4.4.2/gcc/configure Sat Dec 19 21:07:07 2009 +@@ -19381,7 +19381,7 @@ + dynamic_linker='ldqnx.so' + ;; + +-openbsd*) ++mirbsd*|openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no diff --git a/package/gcc/patches/no-lib64.patch b/package/gcc/patches/no-lib64.patch new file mode 100644 index 000000000..add17ecb8 --- /dev/null +++ b/package/gcc/patches/no-lib64.patch @@ -0,0 +1,47 @@ +diff -Nur gcc-4.4.1.orig/gcc/config/i386/linux64.h gcc-4.4.1/gcc/config/i386/linux64.h +--- gcc-4.4.1.orig/gcc/config/i386/linux64.h 2009-04-10 01:23:07.000000000 +0200 ++++ gcc-4.4.1/gcc/config/i386/linux64.h 2009-08-21 18:34:13.000000000 +0200 +@@ -59,7 +59,7 @@ + done. */ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" + + #undef ASM_SPEC + #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ +diff -Nur gcc-4.4.1.orig/gcc/config/i386/t-linux64 gcc-4.4.1/gcc/config/i386/t-linux64 +--- gcc-4.4.1.orig/gcc/config/i386/t-linux64 2008-07-02 17:59:19.000000000 +0200 ++++ gcc-4.4.1/gcc/config/i386/t-linux64 2009-08-21 18:34:13.000000000 +0200 +@@ -7,7 +7,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib +diff -Nur gcc-4.4.1.orig/gcc/config/mips/linux64.h gcc-4.4.1/gcc/config/mips/linux64.h +--- gcc-4.4.1.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100 ++++ gcc-4.4.1/gcc/config/mips/linux64.h 2009-08-21 18:37:19.000000000 +0200 +@@ -36,7 +36,7 @@ + %{profile:-lc_p} %{!profile:-lc}}" + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" + #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define LINUX_DYNAMIC_LINKERN32 \ +diff -Nur gcc-4.4.1.orig/gcc/config/mips/t-linux64 gcc-4.4.1/gcc/config/mips/t-linux64 +--- gcc-4.4.1.orig/gcc/config/mips/t-linux64 2006-06-06 14:51:24.000000000 +0200 ++++ gcc-4.4.1/gcc/config/mips/t-linux64 2009-08-21 18:34:13.000000000 +0200 +@@ -1,6 +1,6 @@ + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 + MULTILIB_DIRNAMES = n32 32 64 +-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 ++MULTILIB_OSDIRNAMES = ../lib ../lib ../lib + + EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o + diff --git a/package/git/Makefile b/package/git/Makefile index af3dfae68..fb9f114a3 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 05485caf5c503ce378a87759bc3a0509 PKG_DESCR:= fast version control system PKG_SECTION:= scm -PKG_DEPENDS:= libopenssl libcurl libexpat +PKG_DEPENDS:= libopenssl libcurl libexpat libpthread PKG_BUILDDEP+= openssl curl expat PKG_URL:= http://git-scm.com PKG_SITES:= http://kernel.org/pub/software/scm/git/ diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 88a7492f5..fe0288232 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mksh -PKG_VERSION:= 39b +PKG_VERSION:= 39c PKG_RELEASE:= 1 -PKG_MD5SUM:= 91274beff2be95260a51234d2c7bb4f7 +PKG_MD5SUM:= 0c3cd172b47eefcdf9a302baa42f5092 PKG_DESCR:= MirBSD Korn Shell PKG_SECTION:= shells PKG_URL:= http://www.mirbsd.org diff --git a/package/mksh/patches/patch-dot_mkshrc b/package/mksh/patches/patch-dot_mkshrc index e538fb5d5..2b215b93e 100644 --- a/package/mksh/patches/patch-dot_mkshrc +++ b/package/mksh/patches/patch-dot_mkshrc @@ -1,8 +1,8 @@ ---- mksh.orig/dot.mkshrc 2010-02-16 20:13:59.000000000 +0100 -+++ mksh/dot.mkshrc 2010-02-16 20:13:50.000000000 +0100 +--- mksh/dot.mkshrc~ Thu Feb 25 20:48:10 2010 ++++ mksh/dot.mkshrc Sun Feb 28 18:05:10 2010 @@ -21,7 +21,7 @@ #- - # ~/.mkshrc: mksh initialisation file for interactive shells + # ${ENV:-~/.mkshrc}: mksh initialisation file for interactive shells -: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)} +: ${EDITOR:=/bin/vi} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)} diff --git a/package/strace/patches/patch-syscall_c b/package/strace/patches/patch-syscall_c new file mode 100644 index 000000000..810e70d35 --- /dev/null +++ b/package/strace/patches/patch-syscall_c @@ -0,0 +1,13 @@ +from git +http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=blobdiff;f=syscall.c;h=a56d7df44874389fbd1d171a94698d07a1e5555a;hp=4f46bf63d180feae18480b697764257947af699b;hb=2ee50b7;hpb=c8c6698ef7cde83a496b273672a51ec2a8f14fb3 +--- strace-4.5.19.orig/syscall.c 2009-10-12 21:54:21.000000000 +0200 ++++ strace-4.5.19/syscall.c 2010-02-28 19:14:28.000000000 +0100 +@@ -2035,7 +2035,7 @@ syscall_enter(struct tcb *tcp) + else + nargs = tcp->u_nargs = MAX_ARGS; + +- if (ptrace (PTRACE_GETREGS, pid, NULL, (long) ®s) < 0) ++ if (ptrace (PTRACE_GETREGS, tcp->pid, NULL, (long) ®s) < 0) + return -1; + + for(i = 0; i < nargs; i++) { |