summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/busybox/Makefile4
-rw-r--r--package/cfgfs/Makefile2
-rw-r--r--package/dropbear/Makefile2
-rw-r--r--package/gdb/Makefile8
-rw-r--r--package/gdb/patches/patch-gdb_common_gdb_thread_db_h2
-rw-r--r--package/gdb/patches/patch-gdb_common_linux-ptrace_h2
-rw-r--r--package/gdb/patches/patch-gdb_common_signals_c2
-rw-r--r--package/gdb/patches/patch-gdb_linux-nat_c2
-rw-r--r--package/gdb/src/gdb/sgidefs.h30
-rw-r--r--package/libqb/Makefile4
-rw-r--r--package/libqb/patches/patch-Makefile_in11
-rw-r--r--package/musl/Config.in.manual1
-rw-r--r--package/musl/Makefile6
-rw-r--r--package/rsync/Makefile5
-rw-r--r--package/strace/Makefile3
-rw-r--r--package/strace/patches/patch-signal_c12
-rw-r--r--package/strace/src/sgidefs.h30
17 files changed, 107 insertions, 19 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 4d751a2b1..4a8e8ea68 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -38,12 +38,8 @@ BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \
HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
-C ${WRKBUILD}
ifneq (${ADK_NATIVE},y)
-ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y)
BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc'
else
-BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)"
-endif
-else
BB_MAKE_FLAGS+= EXTRA_LDFLAGS="-static-libgcc"
endif
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 5c902fc1e..159bd229b 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -26,9 +26,7 @@ $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
-ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y)
TARGET_LDFLAGS+= -static-libgcc
-endif
do-install:
${INSTALL_DIR} ${IDIR_CFGFS}/sbin
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index b3756a8d9..a7c2356e0 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -32,9 +32,7 @@ ifeq ($(ADK_STATIC),y)
TARGET_LDFLAGS+= -static
endif
-ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y)
TARGET_LDFLAGS+= -static-libgcc
-endif
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
CONFIGURE_ARGS+= --disable-pam \
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 85a40b195..3670f731e 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc
PKG_DESCR:= GNU debugger
PKG_SECTION:= debug
-PKG_DEPENDS:= libthread-db libncurses libiconv libexpat
+PKG_DEPENDS:= libthread-db libncurses libiconv libexpat libgcc
PKG_BUILDDEP:= ncurses readline libiconv expat
PKG_NOPARALLEL:= 1
@@ -18,6 +18,7 @@ $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},
ifeq ($(ADK_STATIC),y)
TARGET_CFLAGS+= -static
+CONFIGURE_ARGS+= --enable-static
endif
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -27,14 +28,11 @@ CONFIGURE_ARGS+= --without-uiout --enable-gdbmi \
--without-included-gettext --disable-sim \
--with-curses --disable-werror \
--disable-gdbserver \
- --enable-static --without-python
+ --without-python
XAKE_FLAGS+= LDFLAGS='${TARGET_LDFLAGS}'
# disable honour cflags stuff
XAKE_FLAGS+= GCC_HONOUR_COPTS:=s
-pre-build:
- @-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a
-
post-install:
${INSTALL_DIR} ${IDIR_GDB}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/
diff --git a/package/gdb/patches/patch-gdb_common_gdb_thread_db_h b/package/gdb/patches/patch-gdb_common_gdb_thread_db_h
index 12ab8ebaf..ddcea422f 100644
--- a/package/gdb/patches/patch-gdb_common_gdb_thread_db_h
+++ b/package/gdb/patches/patch-gdb_common_gdb_thread_db_h
@@ -1,3 +1,5 @@
+* added from https://github.com/rofl0r/sabotage
+
--- gdb-7.6.orig/gdb/common/gdb_thread_db.h 2013-01-01 07:32:54.000000000 +0100
+++ gdb-7.6/gdb/common/gdb_thread_db.h 2013-08-13 16:37:40.000000000 +0200
@@ -1,17 +1,6 @@
diff --git a/package/gdb/patches/patch-gdb_common_linux-ptrace_h b/package/gdb/patches/patch-gdb_common_linux-ptrace_h
index cc6556d0a..51e2c3637 100644
--- a/package/gdb/patches/patch-gdb_common_linux-ptrace_h
+++ b/package/gdb/patches/patch-gdb_common_linux-ptrace_h
@@ -1,3 +1,5 @@
+* added from https://github.com/rofl0r/sabotage
+
--- gdb-7.6.orig/gdb/common/linux-ptrace.h 2013-01-01 07:32:54.000000000 +0100
+++ gdb-7.6/gdb/common/linux-ptrace.h 2013-08-13 17:10:13.000000000 +0200
@@ -20,6 +20,7 @@
diff --git a/package/gdb/patches/patch-gdb_common_signals_c b/package/gdb/patches/patch-gdb_common_signals_c
index 666e37430..114f5b867 100644
--- a/package/gdb/patches/patch-gdb_common_signals_c
+++ b/package/gdb/patches/patch-gdb_common_signals_c
@@ -1,3 +1,5 @@
+* added from https://github.com/rofl0r/sabotage
+
--- gdb-7.5.orig/gdb/common/signals.c 2012-05-24 18:51:37.000000000 +0200
+++ gdb-7.5/gdb/common/signals.c 2012-10-01 14:44:23.000000000 +0200
@@ -346,6 +346,8 @@ gdb_signal_from_host (int hostsig)
diff --git a/package/gdb/patches/patch-gdb_linux-nat_c b/package/gdb/patches/patch-gdb_linux-nat_c
index 50ba9bf6c..9ba7254ca 100644
--- a/package/gdb/patches/patch-gdb_linux-nat_c
+++ b/package/gdb/patches/patch-gdb_linux-nat_c
@@ -1,3 +1,5 @@
+* added from https://github.com/rofl0r/sabotage
+
--- gdb-7.6.orig/gdb/linux-nat.c 2013-02-13 15:59:49.000000000 +0100
+++ gdb-7.6/gdb/linux-nat.c 2013-08-13 17:01:09.000000000 +0200
@@ -79,6 +79,14 @@
diff --git a/package/gdb/src/gdb/sgidefs.h b/package/gdb/src/gdb/sgidefs.h
new file mode 100644
index 000000000..a6d250ab7
--- /dev/null
+++ b/package/gdb/src/gdb/sgidefs.h
@@ -0,0 +1,30 @@
+#ifndef _SGIDEFS_H
+#define _SGIDEFS_H
+
+/* MIPS ABI crap that GLIBC puts into /include
+by default, and GDB depends on it happily. */
+
+#define _MIPS_ISA_MIPS1 1
+#define _MIPS_ISA_MIPS2 2
+#define _MIPS_ISA_MIPS3 3
+#define _MIPS_ISA_MIPS4 4
+#define _MIPS_ISA_MIPS5 5
+#define _MIPS_ISA_MIPS32 6
+#define _MIPS_ISA_MIPS64 7
+
+#ifndef _ABIO32
+#define _ABIO32 1
+#endif
+#define _MIPS_SIM_ABI32 _ABIO32
+
+#ifndef _ABIN32
+#define _ABIN32 2
+#endif
+#define _MIPS_SIM_NABI32 _ABIN32
+
+#ifndef _ABI64
+#define _ABI64 3
+#endif
+#define _MIPS_SIM_ABI64 _ABI64
+
+#endif
diff --git a/package/libqb/Makefile b/package/libqb/Makefile
index 6a3ddb3f2..a2d897bcd 100644
--- a/package/libqb/Makefile
+++ b/package/libqb/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= libqb
-PKG_VERSION:= 0.14.1
+PKG_VERSION:= 0.16.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= c144a5e0cd5b69c8d46a051646609f11
+PKG_MD5SUM:= 88a256ce5217efa420598ade393879ff
PKG_DESCR:= high performance client server reusable features
PKG_SECTION:= libs
PKG_URL:= https://github.com/asalkeld/libqb/wiki#wiki-Releases
diff --git a/package/libqb/patches/patch-Makefile_in b/package/libqb/patches/patch-Makefile_in
new file mode 100644
index 000000000..f73094833
--- /dev/null
+++ b/package/libqb/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- libqb-0.16.0.orig/Makefile.in 2013-07-25 20:16:10.000000000 +0200
++++ libqb-0.16.0/Makefile.in 2013-09-09 06:26:09.718825909 +0200
+@@ -352,7 +352,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+
+ ACLOCAL_AMFLAGS = -I m4
+ dist_doc_DATA = COPYING INSTALL README.markdown
+-SUBDIRS = include lib docs tools tests examples
++SUBDIRS = include lib docs tools
+ RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \
+ --define "_specdir $(abs_builddir)" \
+ --define "_builddir $(abs_builddir)" \
diff --git a/package/musl/Config.in.manual b/package/musl/Config.in.manual
index a3881c1e8..19f590e61 100644
--- a/package/musl/Config.in.manual
+++ b/package/musl/Config.in.manual
@@ -4,7 +4,6 @@ config ADK_PACKAGE_MUSL
default y if ADK_TARGET_LIB_MUSL && !ADK_TOOLCHAIN_ONLY
default n
depends on ADK_TARGET_LIB_MUSL
- select ADK_PACKAGE_LIBGCC
help
Embedded C library.
diff --git a/package/musl/Makefile b/package/musl/Makefile
index e7526572f..86e75cc26 100644
--- a/package/musl/Makefile
+++ b/package/musl/Makefile
@@ -33,6 +33,12 @@ endif
ifeq ($(CPU_ARCH),i486)
MARCH:= i386
endif
+ifeq ($(CPU_ARCH),mipsel)
+MARCH:= mips
+endif
+ifeq ($(CPU_ARCH),ppc)
+MARCH:= powerpc
+endif
# do nothing, musl is already build in toolchain directory
do-install:
diff --git a/package/rsync/Makefile b/package/rsync/Makefile
index 63451f041..054a5d641 100644
--- a/package/rsync/Makefile
+++ b/package/rsync/Makefile
@@ -18,6 +18,11 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,RSYNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+= -static
+TARGET_LDFLAGS+= -static
+endif
+
post-install:
${INSTALL_DIR} ${IDIR_RSYNC}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/rsync ${IDIR_RSYNC}/usr/bin
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 98647b555..c6880faa4 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= strace
PKG_VERSION:= 4.8
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= c575ef43829586801f514fd91bfe7575
PKG_DESCR:= System call trace program
PKG_SECTION:= debug
+PKG_DEPENDS:= libgcc
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=strace/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
diff --git a/package/strace/patches/patch-signal_c b/package/strace/patches/patch-signal_c
index 041f7177b..27e3d0d77 100644
--- a/package/strace/patches/patch-signal_c
+++ b/package/strace/patches/patch-signal_c
@@ -1,6 +1,14 @@
--- strace-4.8.orig/signal.c 2013-05-23 15:41:23.000000000 +0200
-+++ strace-4.8/signal.c 2013-08-14 08:50:16.000000000 +0200
-@@ -815,7 +815,7 @@ sys_sigreturn(struct tcb *tcp)
++++ strace-4.8/signal.c 2013-09-13 16:20:20.000000000 +0200
+@@ -61,6 +61,7 @@
+ #endif
+
+ #if defined(SPARC) || defined(SPARC64) || defined(MIPS)
++#include <asm/ptrace.h>
+ typedef struct {
+ struct pt_regs si_regs;
+ int si_mask;
+@@ -815,7 +816,7 @@ sys_sigreturn(struct tcb *tcp)
{
#if defined(ARM)
if (entering(tcp)) {
diff --git a/package/strace/src/sgidefs.h b/package/strace/src/sgidefs.h
new file mode 100644
index 000000000..a6d250ab7
--- /dev/null
+++ b/package/strace/src/sgidefs.h
@@ -0,0 +1,30 @@
+#ifndef _SGIDEFS_H
+#define _SGIDEFS_H
+
+/* MIPS ABI crap that GLIBC puts into /include
+by default, and GDB depends on it happily. */
+
+#define _MIPS_ISA_MIPS1 1
+#define _MIPS_ISA_MIPS2 2
+#define _MIPS_ISA_MIPS3 3
+#define _MIPS_ISA_MIPS4 4
+#define _MIPS_ISA_MIPS5 5
+#define _MIPS_ISA_MIPS32 6
+#define _MIPS_ISA_MIPS64 7
+
+#ifndef _ABIO32
+#define _ABIO32 1
+#endif
+#define _MIPS_SIM_ABI32 _ABIO32
+
+#ifndef _ABIN32
+#define _ABIN32 2
+#endif
+#define _MIPS_SIM_NABI32 _ABIN32
+
+#ifndef _ABI64
+#define _ABI64 3
+#endif
+#define _MIPS_SIM_ABI64 _ABI64
+
+#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-13 18:12:08 +0000