summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/alsa-lib/Makefile2
-rw-r--r--package/alsa-lib/patches/patch-src_conf_c34
-rw-r--r--package/alsa-utils/Makefile2
-rw-r--r--package/base-files/Makefile4
-rw-r--r--package/kismet/Makefile5
-rw-r--r--package/krb5/Makefile3
-rw-r--r--package/libgcc/Makefile6
-rw-r--r--package/openafs/Makefile1
-rw-r--r--package/pciutils/Makefile2
-rw-r--r--package/tor/Makefile4
-rw-r--r--package/uclibc++/Makefile2
-rw-r--r--package/v4l-utils/Makefile2
12 files changed, 49 insertions, 18 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index fa01868b7..01d5fee2e 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= alsa-lib
PKG_VERSION:= 1.0.27.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 3
PKG_MD5SUM:= 69129a7c37697f81ac092335e9fa452b
PKG_DESCR:= ALSA sound library
PKG_SECTION:= libs
diff --git a/package/alsa-lib/patches/patch-src_conf_c b/package/alsa-lib/patches/patch-src_conf_c
index a6f296614..f3c1e70bd 100644
--- a/package/alsa-lib/patches/patch-src_conf_c
+++ b/package/alsa-lib/patches/patch-src_conf_c
@@ -1,13 +1,35 @@
-* added idea/patch from https://github.com/rofl0r/sabotage
-
+from alpinelinux
+ http://git.alpinelinux.org/cgit/aports/tree/main/alsa-lib/alsa-lib-portable-mutex.patch
--- alsa-lib-1.0.27.2.orig/src/conf.c 2013-07-08 14:31:36.000000000 +0200
-+++ alsa-lib-1.0.27.2/src/conf.c 2013-09-17 18:30:14.000000000 +0200
-@@ -428,7 +428,7 @@ beginning:</P>
++++ alsa-lib-1.0.27.2/src/conf.c 2013-10-02 14:32:15.000000000 +0200
+@@ -427,8 +427,8 @@ beginning:</P>
+ #ifndef DOC_HIDDEN
#ifdef HAVE_LIBPTHREAD
- static pthread_mutex_t snd_config_update_mutex =
+-static pthread_mutex_t snd_config_update_mutex =
- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+ {{{1,0,0,0,0,0,0,0,0,0}}};
++static pthread_mutex_t snd_config_update_mutex;
++static pthread_once_t snd_config_update_mutex_once = PTHREAD_ONCE_INIT;
#endif
struct _snd_config {
+@@ -472,8 +472,19 @@ typedef struct {
+
+ #ifdef HAVE_LIBPTHREAD
+
++static void snd_config_init_mutex(void)
++{
++ pthread_mutexattr_t attr;
++
++ pthread_mutexattr_init(&attr);
++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
++ pthread_mutex_init(&snd_config_update_mutex, &attr);
++ pthread_mutexattr_destroy(&attr);
++}
++
+ static inline void snd_config_lock(void)
+ {
++ pthread_once(&snd_config_update_mutex_once, snd_config_init_mutex);
+ pthread_mutex_lock(&snd_config_update_mutex);
+ }
+
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 0d6881c48..8c0f5922e 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= b65e9a04181bd7c9db7667a4566f8dc3
PKG_DESCR:= ALSA mixer utility
PKG_SECTION:= multimedia
-PKG_DEPENDS:= alsa-lib libpthread libgcc
+PKG_DEPENDS:= alsa-lib libpthread libgcc librt
PKG_BUILDDEP:= alsa-lib
PKG_URL:= http://www.alsa-project.org/
PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8ff743270..9d373653a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
-PKG_RELEASE:= 59
+PKG_RELEASE:= 60
PKG_SECTION:= base
PKG_DESCR:= basic files and scripts
@@ -65,7 +65,7 @@ endif
ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y)
$(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab
endif
-ifeq ($(ADK_TARGET_SYSTEM_ARANYM),y)
+ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y)
$(SED) 's#ttyS#nfcon0#g' $(IDIR_BASE_FILES)/etc/inittab
endif
$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index 7ec5e7d0a..df2655956 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= kismet
PKG_VERSION:= 2011-01-R1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 1fb1f024a7ca52814b255e2f2faccf3b
PKG_DESCR:= Kismet
PKG_SECTION:= wifi
-PKG_DEPENDS:= libpcap libncurses
+PKG_DEPENDS:= libpcap libncurses libpthread
PKG_BUILDDEP:= libpcap ncurses
PKG_URL:= http://www.kismetwireless.net/
PKG_SITES:= http://www.kismetwireless.net/code/
@@ -26,6 +26,7 @@ $(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELE
$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_DRONE},${PKG_SECTION}))
$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_KISMET_SERVER},${PKG_SECTION}))
+TARGET_LDFLAGS+= -lpthread
CONFIGURE_ARGS+= --sysconfdir=/etc/kismet
pre-build:
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 3982ebfd9..da18b361d 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= krb5
PKG_VERSION:= 1.11.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 56f0ae274b285320b8a597cb89442449
PKG_DESCR:= MIT kerberos server
PKG_SECTION:= crypto
@@ -47,6 +47,7 @@ CONFIGURE_ARGS+= --disable-static \
--disable-profiled \
--with-system-ss \
--with-system-et \
+ --without-system-verto \
--without-tcl
CONFIGURE_ENV+= krb5_cv_attr_constructor_destructor=yes,yes \
ac_cv_func_regcomp=yes \
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 9c024504c..191d1f610 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -25,7 +25,11 @@ do-install:
ifeq ($(ADK_NATIVE),)
${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
ifeq ($(ADK_LINUX_SH),y)
- ${CP} ${STAGING_TARGET_DIR}/lib/!m1/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+ifeq ($(ADK_TARGET_LIB_GLIBC),y)
+ ${CP} ${STAGING_TARGET_DIR}/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+else
+ ${CP} ${STAGING_TARGET_DIR}/lib/!m4/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+endif
else
${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
endif
diff --git a/package/openafs/Makefile b/package/openafs/Makefile
index 37b37980d..a5a81dcc0 100644
--- a/package/openafs/Makefile
+++ b/package/openafs/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= net/fs
PKG_URL:= http://openafs.org
PKG_SITES:= http://www.openafs.org/dl/openafs/${PKG_VERSION}/
+PKG_LIBC_DEPENDS:= eglibc glibc musl
PKG_CFLINE_OPENAFS+= select ADK_KERNEL_KEYS
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-src.tar.bz2
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index 1cde53cf7..142a04508 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 51ded74e4184d4a6c9f2ada95c28c067
PKG_DESCR:= PCI Utilities
PKG_SECTION:= utils
-PKG_DEPENDS:= zlib
+PKG_DEPENDS:= zlib libgcc
PKG_BUILDDEP:= zlib
PKG_URL:= http://www.kernel.org/pub/software/utils/pciutils/
PKG_SITES:= http://www.kernel.org/pub/software/utils/pciutils/
diff --git a/package/tor/Makefile b/package/tor/Makefile
index cc0e98bbe..cfbce3456 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= tor
PKG_VERSION:= 0.2.3.25
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= a1c364189a9a66ed9daa8e6436489daf
PKG_DESCR:= An anonymous Internet communication system
PKG_SECTION:= proxy
@@ -27,6 +27,8 @@ CONFIGURE_ENV+= ac_cv_libevent_normal=yes \
tor_cv_null_is_zero=yes \
tor_cv_unaligned_ok=yes
+CONFIGURE_ARGS+= --disable-gcc-hardening
+
post-install:
${INSTALL_DIR} ${IDIR_TOR}/usr/bin ${IDIR_TOR}/etc/tor
${INSTALL_DATA} ./files/torrc ${IDIR_TOR}/etc/tor/
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index c51819429..dfb93f197 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -16,7 +16,7 @@ PKG_NOPARALLEL:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_CFLINE_UCLIBCXX:= depends on ADK_TARGET_LIB_UCLIBC
+PKG_LIBC_DEPENDS:= uclibc
include ${TOPDIR}/mk/package.mk
diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
index f8e1e430f..17bed1502 100644
--- a/package/v4l-utils/Makefile
+++ b/package/v4l-utils/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= http://linuxtv.org/downloads/v4l-utils/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_CFLINE_V4L_UTILS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_LIBC_DEPENDS:= eglibc glibc
PKG_SUBPKGS:= V4L_UTILS LIBV4L
include $(TOPDIR)/mk/package.mk
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 08:12:22 +0000