From 7709c0e4f3a9ea4fddbe5764c000135f9eacac49 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Jan 2011 10:58:57 +0100 Subject: fix wrong rpath and cflags --- package/freeglut/Makefile | 2 +- package/mplayer/Makefile | 4 +-- package/mplayer/patches/patch-configure | 11 ++++++++ package/openssh/Makefile | 1 + package/procmail/src/Makefile.new | 4 +-- package/rtorrent/patches/patch-ltmain_sh | 30 ++++++++++++++++++++++ .../rtorrent/patches/patch-src_command_download_cc | 6 ++--- .../rtorrent/patches/patch-src_command_events_cc | 6 ++--- .../rtorrent/patches/patch-src_command_network_cc | 6 ++--- package/rtorrent/patches/patch-src_rpc_parse_cc | 8 +++--- .../rtorrent/patches/patch-src_rpc_scgi_task_cc | 6 ++--- .../rtorrent/patches/patch-src_utils_lockfile_cc | 6 ++--- 12 files changed, 66 insertions(+), 24 deletions(-) create mode 100644 package/mplayer/patches/patch-configure create mode 100644 package/rtorrent/patches/patch-ltmain_sh (limited to 'package') diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile index fe9b03d0a..b34ac88d8 100644 --- a/package/freeglut/Makefile +++ b/package/freeglut/Makefile @@ -13,7 +13,7 @@ PKG_BUILDDEP:= MesaLib PKG_URL:= http://freeglut.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freeglut/} -PKG_HOST_DEPENDS:= !cygwin !darwin +PKG_HOST_DEPENDS:= !cygwin PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el include $(TOPDIR)/mk/package.mk diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index bad5c656d..6b4521cf5 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer PKG_VERSION:= 1.0-32749 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= aadc5d8cca503c8b18b3ed00b3a52cf5 PKG_DESCR:= popular video player PKG_SECTION:= multimedia @@ -127,7 +127,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --disable-xinerama \ --disable-vidix \ --disable-gl \ - --extra-cflags="${TCFLAGS} ${EXTRA_CFLAGS}" \ + --extra-cflags="${EXTRA_CFLAGS}" \ ${CONFIGURE_CPU_OPTS} \ ${CONFIGURE_DEBUG} \ ${CONFIGURE_DIRECTFB} diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure new file mode 100644 index 000000000..eb33a8720 --- /dev/null +++ b/package/mplayer/patches/patch-configure @@ -0,0 +1,11 @@ +--- mplayer-1.0-32749.orig/configure 2011-01-03 11:27:11.000000000 +0100 ++++ mplayer-1.0-32749/configure 2011-01-09 00:35:20.000000000 +0100 +@@ -2554,7 +2554,7 @@ else + fi + + cflag_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer" +-cflag_check -MD -MP && DEPFLAGS="-MD -MP $CFLAGS" ++cflag_check -MD -MP && DEPFLAGS="-MD -MP" + + + if test -n "$LDFLAGS" ; then diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 10b4523bc..787d59954 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -56,6 +56,7 @@ CONFIGURE_ARGS+= --disable-strip \ --disable-wtmp \ --disable-wtmpx \ --without-bsd-auth \ + --without-rpath \ --without-pam \ --without-x \ --without-zlib-version-check \ diff --git a/package/procmail/src/Makefile.new b/package/procmail/src/Makefile.new index 38b092ce9..8ec246b2b 100644 --- a/package/procmail/src/Makefile.new +++ b/package/procmail/src/Makefile.new @@ -6,8 +6,8 @@ PM_OBJ=cstdio.o common.o exopen.o goodies.o locking.o \ FM_OBJ=common.o fields.o formisc.o sublib.o ecommon.o \ acommon.o -LDFLAGS = -lm -ldl -lc -CFLAGS = -Os -DPROCMAIL +LDFLAGS ?= -lm -ldl -lc +CFLAGS ?= -DPROCMAIL all: procmail formail diff --git a/package/rtorrent/patches/patch-ltmain_sh b/package/rtorrent/patches/patch-ltmain_sh new file mode 100644 index 000000000..9b491ecbb --- /dev/null +++ b/package/rtorrent/patches/patch-ltmain_sh @@ -0,0 +1,30 @@ +--- rtorrent-0.8.5.orig/ltmain.sh 2009-06-18 21:37:48.000000000 +0200 ++++ rtorrent-0.8.5/ltmain.sh 2011-01-09 01:46:11.000000000 +0100 +@@ -5516,27 +5516,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/rtorrent/patches/patch-src_command_download_cc b/package/rtorrent/patches/patch-src_command_download_cc index 4c1e50a6c..cd5ac7287 100644 --- a/package/rtorrent/patches/patch-src_command_download_cc +++ b/package/rtorrent/patches/patch-src_command_download_cc @@ -1,5 +1,5 @@ ---- rtorrent-0.8.4.orig/src/command_download.cc 2008-11-19 18:01:20.000000000 +0100 -+++ rtorrent-0.8.4/src/command_download.cc 2009-08-28 18:01:37.606461520 +0200 +--- rtorrent-0.8.5.orig/src/command_download.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/command_download.cc 2011-01-09 01:42:55.000000000 +0100 @@ -36,6 +36,7 @@ #include "config.h" @@ -7,4 +7,4 @@ +#include #include #include - #include + #include diff --git a/package/rtorrent/patches/patch-src_command_events_cc b/package/rtorrent/patches/patch-src_command_events_cc index dcd522735..db6da4a11 100644 --- a/package/rtorrent/patches/patch-src_command_events_cc +++ b/package/rtorrent/patches/patch-src_command_events_cc @@ -1,10 +1,10 @@ ---- rtorrent-0.8.4.orig/src/command_events.cc 2008-11-11 11:37:20.000000000 +0100 -+++ rtorrent-0.8.4/src/command_events.cc 2009-08-28 18:14:19.096303800 +0200 +--- rtorrent-0.8.5.orig/src/command_events.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/command_events.cc 2011-01-09 01:42:55.000000000 +0100 @@ -36,6 +36,7 @@ #include "config.h" +#include #include + #include #include - #include diff --git a/package/rtorrent/patches/patch-src_command_network_cc b/package/rtorrent/patches/patch-src_command_network_cc index 5d0405ebe..89a44d351 100644 --- a/package/rtorrent/patches/patch-src_command_network_cc +++ b/package/rtorrent/patches/patch-src_command_network_cc @@ -1,11 +1,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.2.orig/src/command_network.cc 2008-05-07 14:19:11.000000000 +0200 -+++ rtorrent-0.8.2/src/command_network.cc 2009-05-29 01:38:53.000000000 +0200 +--- rtorrent-0.8.5.orig/src/command_network.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/command_network.cc 2011-01-09 01:42:55.000000000 +0100 @@ -36,6 +36,7 @@ #include "config.h" +#include #include + #include #include - #include diff --git a/package/rtorrent/patches/patch-src_rpc_parse_cc b/package/rtorrent/patches/patch-src_rpc_parse_cc index 38530b38e..04a4bd67d 100644 --- a/package/rtorrent/patches/patch-src_rpc_parse_cc +++ b/package/rtorrent/patches/patch-src_rpc_parse_cc @@ -1,9 +1,9 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.4.orig/src/rpc/parse.cc 2008-08-26 22:14:33.000000000 +0200 -+++ rtorrent-0.8.4/src/rpc/parse.cc 2009-08-28 17:58:13.616282106 +0200 -@@ -38,6 +38,8 @@ - +--- rtorrent-0.8.5.orig/src/rpc/parse.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/rpc/parse.cc 2011-01-09 01:42:55.000000000 +0100 +@@ -39,6 +39,8 @@ #include + #include #include +#include +#include diff --git a/package/rtorrent/patches/patch-src_rpc_scgi_task_cc b/package/rtorrent/patches/patch-src_rpc_scgi_task_cc index f81092202..d282b8139 100644 --- a/package/rtorrent/patches/patch-src_rpc_scgi_task_cc +++ b/package/rtorrent/patches/patch-src_rpc_scgi_task_cc @@ -1,11 +1,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.2.orig/src/rpc/scgi_task.cc 2008-05-07 14:19:10.000000000 +0200 -+++ rtorrent-0.8.2/src/rpc/scgi_task.cc 2009-05-29 01:29:24.000000000 +0200 +--- rtorrent-0.8.5.orig/src/rpc/scgi_task.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/rpc/scgi_task.cc 2011-01-09 01:42:55.000000000 +0100 @@ -36,6 +36,7 @@ #include "config.h" +#include #include + #include #include - #include diff --git a/package/rtorrent/patches/patch-src_utils_lockfile_cc b/package/rtorrent/patches/patch-src_utils_lockfile_cc index 58eafdfc8..31b2cd3fc 100644 --- a/package/rtorrent/patches/patch-src_utils_lockfile_cc +++ b/package/rtorrent/patches/patch-src_utils_lockfile_cc @@ -1,11 +1,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.2.orig/src/utils/lockfile.cc 2008-05-07 14:19:11.000000000 +0200 -+++ rtorrent-0.8.2/src/utils/lockfile.cc 2009-05-29 01:34:05.000000000 +0200 +--- rtorrent-0.8.5.orig/src/utils/lockfile.cc 2009-05-14 14:34:42.000000000 +0200 ++++ rtorrent-0.8.5/src/utils/lockfile.cc 2011-01-09 01:42:55.000000000 +0100 @@ -39,6 +39,7 @@ #include #include #include +#include #include + #include #include - #include -- cgit v1.2.3