From 4f157056c307ae7d5d0cbd4fa35ffeb2916cd2e0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 15 Feb 2014 15:52:29 +0100 Subject: more Darwin compat fixes, add java as build dependency check for xbmc --- package/bzr/Makefile | 8 +++-- package/monit/patches/patch-configure | 11 +++++++ package/mozjs/Makefile | 2 ++ package/nmap/Makefile | 1 + package/nmap/patches/patch-liblinear_Makefile | 16 ++++++++++ package/openvpn/Makefile | 3 ++ package/openvpn/patches/patch-configure_ac | 31 +++++++++++++++++++ package/polkit/Makefile | 2 ++ package/systemd/Makefile | 36 ---------------------- package/systemd/files/udev.conffiles | 1 - package/systemd/patches/patch-Makefile_am | 20 ------------ package/systemd/patches/patch-configure_ac | 12 -------- .../patches/patch-src_gudev_gudev-1_0_pc_in | 13 -------- .../patches/patch-src_libudev_libudev_pc_in | 15 --------- 14 files changed, 71 insertions(+), 100 deletions(-) create mode 100644 package/monit/patches/patch-configure create mode 100644 package/nmap/patches/patch-liblinear_Makefile create mode 100644 package/openvpn/patches/patch-configure_ac delete mode 100644 package/systemd/Makefile delete mode 100644 package/systemd/files/udev.conffiles delete mode 100644 package/systemd/patches/patch-Makefile_am delete mode 100644 package/systemd/patches/patch-configure_ac delete mode 100644 package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in delete mode 100644 package/systemd/patches/patch-src_libudev_libudev_pc_in (limited to 'package') diff --git a/package/bzr/Makefile b/package/bzr/Makefile index 2875092ab..f1166b02c 100644 --- a/package/bzr/Makefile +++ b/package/bzr/Makefile @@ -4,15 +4,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:= bzr -PKG_VERSION:= 2.5.1 +PKG_VERSION:= 2.6.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= ac5079858364a046071000d5cdccb67b +PKG_MD5SUM:= 28c86653d0df10d202c6b842deb0ea35 PKG_DESCR:= bazaar PKG_SECTION:= scm PKG_BUILDDEP:= python2 PKG_DEPENDS:= python2 PKG_URL:= http://bazaar.canonical.com/en/ -PKG_SITES:= https://launchpad.net/bzr/2.5/2.5.1/+download/ +PKG_SITES:= https://launchpad.net/bzr/2.6/2.6.0/+download/ + +PKG_HOST_DEPENDS:= !darwin include $(TOPDIR)/mk/package.mk diff --git a/package/monit/patches/patch-configure b/package/monit/patches/patch-configure new file mode 100644 index 000000000..47c84cd38 --- /dev/null +++ b/package/monit/patches/patch-configure @@ -0,0 +1,11 @@ +--- monit-5.6.orig/configure 2013-09-03 14:55:49.000000000 +0200 ++++ monit-5.6/configure 2014-02-10 18:05:03.000000000 +0100 +@@ -13575,7 +13575,7 @@ fi + # ------------------------------------------------------------------------ + + # Backward compatibility until we get ride of arch settings +-architecture=`uname` ++architecture=Linux + if test "$architecture" = "SunOS" + then + ARCH="SOLARIS" diff --git a/package/mozjs/Makefile b/package/mozjs/Makefile index 3d08b64cf..390df7cf1 100644 --- a/package/mozjs/Makefile +++ b/package/mozjs/Makefile @@ -13,6 +13,8 @@ PKG_BUILDDEP:= bzip2-host python2-host nspr PKG_SITES:= http://ftp.mozilla.org/pub/mozilla.org/js/ PKG_OPTS:= dev +PKG_HOST_DEPENDS:= !darwin + DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}${PKG_VERSION} WRKSRC= ${WRKDIST}/js/src diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 6a756a4a9..09035c248 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -27,6 +27,7 @@ endif TARGET_CPPFLAGS+= -DNOLUA TARGET_LDFLAGS+= -lpthread +CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no CONFIGURE_ARGS+= --without-openssl \ --without-zenmap \ --without-ndiff \ diff --git a/package/nmap/patches/patch-liblinear_Makefile b/package/nmap/patches/patch-liblinear_Makefile new file mode 100644 index 000000000..fdb24470d --- /dev/null +++ b/package/nmap/patches/patch-liblinear_Makefile @@ -0,0 +1,16 @@ +--- nmap-6.40.orig/liblinear/Makefile 2011-09-23 23:15:09.000000000 +0200 ++++ nmap-6.40/liblinear/Makefile 2014-02-11 19:38:23.000000000 +0100 +@@ -1,10 +1,10 @@ + CXX ?= g++ + CC ?= gcc +-CFLAGS = -Wall -Wconversion -O3 -fPIC ++CFLAGS ?= -Wall -Wconversion -O3 -fPIC + LIBS = blas/blas.a + SHVER = 1 +-AR = ar +-RANLIB = ranlib ++AR ?= ar ++RANLIB ?= ranlib + #LIBS = -lblas + + all: train predict diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 9222a54ff..e3a5e4ac0 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 06e5f93dbf13f2c19647ca15ffc23ac1 PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net/security +PKG_BUILDDEP:= autotool PKG_DEPENDS:= kmod-tun ip PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ @@ -35,6 +36,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf + ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),) CONFIGURE_ARGS+= --enable-lzo else diff --git a/package/openvpn/patches/patch-configure_ac b/package/openvpn/patches/patch-configure_ac new file mode 100644 index 000000000..c0a43dae4 --- /dev/null +++ b/package/openvpn/patches/patch-configure_ac @@ -0,0 +1,31 @@ +--- openvpn-2.3.2.orig/configure.ac 2013-05-31 14:00:25.000000000 +0200 ++++ openvpn-2.3.2/configure.ac 2014-02-15 14:45:30.000000000 +0100 +@@ -353,19 +353,13 @@ AC_PROG_MAKE_SET + + AC_ARG_VAR([IFCONFIG], [full path to ipconfig utility]) + AC_ARG_VAR([ROUTE], [full path to route utility]) +-AC_ARG_VAR([IPROUTE], [full path to ip utility]) + AC_ARG_VAR([NETSTAT], [path to netstat utility]) # tests + AC_ARG_VAR([MAN2HTML], [path to man2html utility]) + AC_ARG_VAR([GIT], [path to git utility]) +-AC_PATH_PROGS([IFCONFIG], [ifconfig],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) +-AC_PATH_PROGS([ROUTE], [route],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) +-AC_PATH_PROGS([IPROUTE], [ip],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) + AC_CHECK_PROGS([NETSTAT], [netstat], [netstat], [$PATH:/usr/local/sbin:/usr/sbin:/sbin:/etc]) # tests + AC_CHECK_PROGS([MAN2HTML], [man2html]) + AC_CHECK_PROGS([GIT], [git]) # optional +-AC_DEFINE_UNQUOTED([IFCONFIG_PATH], ["$IFCONFIG"], [Path to ifconfig tool]) +-AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["$IPROUTE"], [Path to iproute tool]) +-AC_DEFINE_UNQUOTED([ROUTE_PATH], ["$ROUTE"], [Path to route tool]) ++AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["/sbin"], [Path to iproute tool]) + + # + # Libtool +@@ -982,7 +976,6 @@ else + fi + + if test "${enable_iproute2}" = "yes"; then +- test -z "${IPROUTE}" && AC_MSG_ERROR([ip utility is required but missing]) + AC_DEFINE([ENABLE_IPROUTE], [1], [enable iproute2 support]) + else + if test "${WIN32}" != "yes"; then diff --git a/package/polkit/Makefile b/package/polkit/Makefile index 5ed8333e3..5be0cd1df 100644 --- a/package/polkit/Makefile +++ b/package/polkit/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://www.freedesktop.org/wiki/Software/polkit/ PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev +PKG_HOST_DEPENDS:= !darwin + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,POLKIT,polkit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/systemd/Makefile b/package/systemd/Makefile deleted file mode 100644 index 5fe43a086..000000000 --- a/package/systemd/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# 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:= systemd -PKG_VERSION:= 208 -PKG_RELEASE:= 4 -PKG_MD5SUM:= df64550d92afbffb4f67a434193ee165 -PKG_DESCR:= System and Service Manager -PKG_SECTION:= utils -PKG_DEPENDS:= libblkid libcap -PKG_BUILDDEP:= autotool usbutils glib kmod util-linux libcap -PKG_BUILDDEP+= libgcrypt gperf-host -PKG_URL:= http://freedesktop.org/wiki/Software/systemd/ -PKG_SITES:= http://www.freedesktop.org/software/systemd/ - -PKG_LIBC_DEPENDS:= eglibc glibc -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,SYSTEMD,systemd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -AUTOTOOL_STYLE:= autoreconf -TARGET_LDFLAGS+= -lrt -CONFIGURE_ARGS+= --disable-static \ - --without-python \ - --enable-gudev \ - --disable-manpages \ - --disable-polkit - -# TODO -systemd-install: - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/systemd/files/udev.conffiles b/package/systemd/files/udev.conffiles deleted file mode 100644 index 50a5fb889..000000000 --- a/package/systemd/files/udev.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/udev/udev.conf diff --git a/package/systemd/patches/patch-Makefile_am b/package/systemd/patches/patch-Makefile_am deleted file mode 100644 index c35e6d461..000000000 --- a/package/systemd/patches/patch-Makefile_am +++ /dev/null @@ -1,20 +0,0 @@ ---- systemd-208.orig/Makefile.am 2013-10-02 04:57:09.000000000 +0200 -+++ systemd-208/Makefile.am 2013-12-14 16:18:32.000000000 +0100 -@@ -23,7 +23,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - AM_MAKEFLAGS = --no-print-directory - AUTOMAKE_OPTIONS = color-tests parallel-tests - --SUBDIRS = . po -+SUBDIRS = . - - # remove targets if the command fails - .DELETE_ON_ERROR: -@@ -537,8 +537,6 @@ dist_doc_DATA = \ - LICENSE.MIT \ - DISTRO_PORTING - --@INTLTOOL_POLICY_RULE@ -- - # ------------------------------------------------------------------------------ - - MANPAGES = diff --git a/package/systemd/patches/patch-configure_ac b/package/systemd/patches/patch-configure_ac deleted file mode 100644 index e3aeaa5c0..000000000 --- a/package/systemd/patches/patch-configure_ac +++ /dev/null @@ -1,12 +0,0 @@ ---- systemd-208.orig/configure.ac 2013-10-02 01:54:26.000000000 +0200 -+++ systemd-208/configure.ac 2013-12-13 16:37:55.000000000 +0100 -@@ -47,9 +47,6 @@ LT_INIT([disable-static]) - AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by systemd])]) - AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by systemd])]) - --# i18n stuff for the PolicyKit policy files --IT_PROG_INTLTOOL([0.40.0]) -- - GETTEXT_PACKAGE=systemd - AC_SUBST(GETTEXT_PACKAGE) - diff --git a/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in b/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in deleted file mode 100644 index 1758a8957..000000000 --- a/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in +++ /dev/null @@ -1,13 +0,0 @@ ---- systemd-208.orig/src/gudev/gudev-1.0.pc.in 2013-08-13 22:02:46.000000000 +0200 -+++ systemd-208/src/gudev/gudev-1.0.pc.in 2014-01-10 16:50:37.000000000 +0100 -@@ -1,7 +1,7 @@ - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+exec_prefix=@prefix@ -+libdir=${prefix}/lib -+includedir=${prefix}/include - - Name: gudev-1.0 - Description: GObject bindings for libudev diff --git a/package/systemd/patches/patch-src_libudev_libudev_pc_in b/package/systemd/patches/patch-src_libudev_libudev_pc_in deleted file mode 100644 index 7bc3ab6f3..000000000 --- a/package/systemd/patches/patch-src_libudev_libudev_pc_in +++ /dev/null @@ -1,15 +0,0 @@ ---- systemd-208.orig/src/libudev/libudev.pc.in 2013-08-13 22:02:46.000000000 +0200 -+++ systemd-208/src/libudev/libudev.pc.in 2013-12-14 17:20:31.000000000 +0100 -@@ -6,9 +6,9 @@ - # (at your option) any later version. - - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+exec_prefix=${prefix}/usr -+libdir=${prefix}/lib -+includedir=${prefix}/include - - Name: libudev - Description: Library to access udev device information -- cgit v1.2.3