summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile5
-rw-r--r--package/boost/Makefile2
-rw-r--r--package/boost/patches/patch-boost_cstdint_hpp14
-rw-r--r--package/dbus/Makefile5
-rw-r--r--package/krb5/Makefile3
-rw-r--r--package/libgcc/Makefile10
-rw-r--r--package/libstdcxx/Makefile1
-rw-r--r--package/lsof/Makefile5
-rw-r--r--package/openjdk7/Makefile2
-rw-r--r--package/pciutils/Makefile2
-rw-r--r--package/pcre/Makefile1
-rw-r--r--package/samba/files/smb.conf4
-rw-r--r--package/v4l-utils/Makefile2
-rw-r--r--package/xsm/Makefile2
14 files changed, 46 insertions, 12 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 605922737..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,6 +65,9 @@ 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_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
test -z $(ADK_RUNTIME_HOSTNAME) || \
echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \
diff --git a/package/boost/Makefile b/package/boost/Makefile
index 271b2937c..cce3246fa 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= boost
PKG_VERSION:= 1.54.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= efbfbff5a85a9330951f243d0a46e4b9
PKG_DESCR:= boost C++ library
PKG_SECTION:= libs
diff --git a/package/boost/patches/patch-boost_cstdint_hpp b/package/boost/patches/patch-boost_cstdint_hpp
new file mode 100644
index 000000000..5b09e892b
--- /dev/null
+++ b/package/boost/patches/patch-boost_cstdint_hpp
@@ -0,0 +1,14 @@
+--- boost_1_54_0.orig/boost/cstdint.hpp 2013-03-09 23:55:05.000000000 +0100
++++ boost_1_54_0/boost/cstdint.hpp 2013-09-19 16:46:42.000000000 +0200
+@@ -41,7 +41,10 @@
+ // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
+ // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
+ //
+-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
++#if defined(BOOST_HAS_STDINT_H) \
++ && (!defined(__GLIBC__) \
++ || defined(__GLIBC_HAVE_LONG_LONG) \
++ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
+
+ // The following #include is an implementation artifact; not part of interface.
+ # ifdef __hpux
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 552a12122..de0ed663c 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= a70edc50524f258eaf5c9a9994ed8748
PKG_DESCR:= DBUS library and daemon
PKG_SECTION:= libs
-PKG_DEPENDS:= libexpat libx11
-PKG_BUILDDEP:= expat libX11
+PKG_DEPENDS:= libexpat libx11 libuuid
+PKG_BUILDDEP:= expat libX11 util-linux
PKG_URL:= http://dbus.freedesktop.org/
PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/
@@ -27,6 +27,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
$(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS}))
+TARGET_LDFLAGS+= -luuid
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
CONFIGURE_ARGS+= --disable-tests \
--disable-abstract-sockets \
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 003cd9783..191d1f610 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -11,7 +11,7 @@ PKG_SECTION:= libs
NO_DISTFILES:= 1
-PKG_ARCH_DEPENDS:= !sh !avr32
+PKG_ARCH_DEPENDS:= !avr32
include ${TOPDIR}/mk/package.mk
@@ -24,8 +24,16 @@ INSTALL_STYLE:= manual
do-install:
ifeq ($(ADK_NATIVE),)
${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+ifeq ($(ADK_LINUX_SH),y)
+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
+endif
ifeq ($(ADK_TARGET_MULTILIB_X86_32),y)
${INSTALL_DIR} ${IDIR_LIBGCC}/lib32
${CP} ${STAGING_TARGET_DIR_32}/lib/libgcc*.so* ${IDIR_LIBGCC}/lib32
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 44f5becd0..fddf9656b 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -34,6 +34,7 @@ ifeq ($(ADK_NATIVE),y)
else
(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so.6)
(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so)
+ (cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.17 libstdc++.so)
$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
-@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py
endif
diff --git a/package/lsof/Makefile b/package/lsof/Makefile
index 1f968dd05..c5ede4836 100644
--- a/package/lsof/Makefile
+++ b/package/lsof/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:= 3
PKG_MD5SUM:= 6dae655988c810a7042c06a4e2fa3c5f
PKG_DESCR:= list open files
PKG_SECTION:= misc
+PKG_DEPENDS:= libtirpc
+PKG_BUILDDEP:= libtirpc
PKG_URL:= http://people.freebsd.org/~abe/
PKG_SITES:= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
@@ -23,7 +25,8 @@ $(eval $(call PKG_template,LSOF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_
CONFIG_STYLE:= minimal
CONFIGURE_PROG:= Configure
CONFIGURE_ARGS:= -n linux
-XAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS} -I$(STAGING_DIR)/usr/include/tirpc' CFGL='${TARGET_LDFLAGS} -L./lib -llsof -ltirpc'
+XAKE_FLAGS+= CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS} -I$(STAGING_DIR)/usr/include/tirpc'
+XAKE_FLAGS+= CFGL='${TARGET_LDFLAGS} -L./lib -llsof -ltirpc'
INSTALL_STYLE:= manual
post-extract:
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index cd84e98a3..8fa2aff9c 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -20,7 +20,7 @@ WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION}
PKG_HOST_DEPENDS:= !darwin !cygwin !openbsd !netbsd !freebsd
PKG_ARCH_DEPENDS:= arm mips x86 x86_64
-PKG_SYSTEM_DEPENDS:= !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx
+PKG_SYSTEM_DEPENDS:= !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx !lemote-yeelong
PKG_SUBPKGS:= OPENJDK7
PKG_CHOICES_OPENJDK7:= ZERO SHARK CACAO
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/pcre/Makefile b/package/pcre/Makefile
index 80e856b57..d81eb7c06 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -24,6 +24,7 @@ $(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},$
$(eval $(call PKG_template,LIBPCRE_DEV,libpcre-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRE_DEV},${PKGSC_LIBPCRE_DEV}))
XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS}
+TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32 -lintl
libpcre-install:
${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib
diff --git a/package/samba/files/smb.conf b/package/samba/files/smb.conf
index 2ac0576d8..1b65b238d 100644
--- a/package/samba/files/smb.conf
+++ b/package/samba/files/smb.conf
@@ -12,9 +12,9 @@
pid directory = /var/run/samba
load printers = no
printcap name = /dev/null
- unix charset = ASCII
+ unix charset = UTF8
dos charset = ASCII
- display charset = ASCII
+ display charset = UTF8
unix extensions = yes
#[media]
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
diff --git a/package/xsm/Makefile b/package/xsm/Makefile
index 73602d44b..72da54414 100644
--- a/package/xsm/Makefile
+++ b/package/xsm/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 6dfc70ae1c13f775f1c646a6d8780076
PKG_DESCR:= X session manager
PKG_SECTION:= x11/apps
+PKG_DEPENDS:= libxaw
+PKG_BUILDDEP:= libXaw
PKG_URL:= http://xorg.freedesktop.org/
PKG_SITES:= ${MASTER_SITE_XORG}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 23:16:37 +0000