summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/cbtt/patches/patch-Makefile (renamed from package/cbtt/patches/100-compile.patch)59
-rw-r--r--package/cpufrequtils/patches/patch-Makefile43
-rw-r--r--package/cpufrequtils/patches/patch-bench_Makefile2
-rw-r--r--scripts/scan-pkgs.sh4
4 files changed, 66 insertions, 42 deletions
diff --git a/package/cbtt/patches/100-compile.patch b/package/cbtt/patches/patch-Makefile
index 86fdb7ca2..6701c7e2b 100644
--- a/package/cbtt/patches/100-compile.patch
+++ b/package/cbtt/patches/patch-Makefile
@@ -1,54 +1,59 @@
-diff -Nur cbtt80-20060211-src/Makefile cbtt80-20060211-src.patched/Makefile
--- cbtt80-20060211-src.orig/Makefile 2006-02-07 18:44:58.000000000 +0100
-+++ cbtt80-20060211-src/Makefile 2009-05-09 16:11:42.000000000 +0200
-@@ -1,10 +1,9 @@
++++ cbtt80-20060211-src/Makefile 2010-02-11 20:13:13.000000000 +0100
+@@ -1,10 +1,8 @@
-SHELL = /bin/sh
-SYSTEM = $(shell uname)
-C++ = g++
-+SHELL ?= /bin/bash
++SHELL ?= /bin/sh
+SYSTEM = Linux
DFLAGS =
-OFLAGS = -O2 -w
-+#OFLAGS = -O2 -w
LFLAGS = -L. -lz
-CFLAGS =
-+CFLAGS ?=
-
- ifeq ($(SYSTEM),Linux)
- DFLAGS += -D__LINUX__
-@@ -30,6 +29,7 @@ CFLAGS =
++CFLAGS ?=
+
+ ifeq ($(SYSTEM),Linux)
+ DFLAGS += -D__LINUX__
+@@ -29,30 +27,31 @@ LFLAGS = -lresolv -lsocket -lnsl -lpthre
+ CFLAGS =
endif
-
- CFLAGS += $(OFLAGS) $(DFLAGS) -I.
+
+-CFLAGS += $(OFLAGS) $(DFLAGS) -I.
+LDFLAGS += $(LFLAGS)
-
++CFLAGS += $(LDFLAGS) -I.
+
OBJS = atom.o base64.o bencode.o client.o config.o link.o md5.o server.o sha1.o sort.o tracker_admin.o tracker_comments.o tracker_file.o tracker_index.o tracker_info.o tracker_login.o tracker_signup.o tracker_stats.o tracker_torrent.o tracker_upload.o tracker_users.o util.o
OBJS_BNBT = bnbt.o tracker.o tracker_announce.o tracker_scrape.o
-@@ -40,19 +40,19 @@ PROGS = ./bnbt ./bnbtmysql
- all: $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS)
-
+ OBJS_BNBTMYSQL = bnbt.mysql.o bnbt_mysql.mysql.o tracker.mysql.o tracker_announce.mysql.o tracker_scrape.mysql.o
+
+-PROGS = ./bnbt ./bnbtmysql
++PROGS = ./bnbt
+
+-all: $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS)
++all: $(OBJS) $(OBJS_BNBT) $(PROGS)
+
./bnbt: $(OBJS) $(OBJS_BNBT)
- $(C++) -o ./bnbt $(OBJS) $(OBJS_BNBT) $(LFLAGS)
+ $(CXX) -o ./bnbt $(OBJS) $(OBJS_BNBT) $(LDFLAGS)
-
+
./bnbtmysql: $(OBJS) $(OBJS_BNBTMYSQL)
- $(C++) -o ./bnbtmysql $(OBJS) $(OBJS_BNBTMYSQL) $(LFLAGS) -L/usr/lib/mysql -lmysqlclient
-+ $(CXX) -o ./bnbtmysql $(OBJS) $(OBJS_BNBTMYSQL) $(LDFLAGS)
-
++ $(CXX) -o ./bnbtmysql $(OBJS) $(OBJS_BNBTMYSQL) $(LDFLAGS) -L/usr/lib/mysql -lmysqlclient
+
clean:
- rm -f $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS)
-
+ rm -f $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS)
+
%.o: %.cpp
- $(C++) -o $@ $(CFLAGS) -c $<
-+ $(CXX) -o $@ $(CPPFLAGS) $(CFLAGS) -c $<
-
++ $(CXX) -o $@ $(CFLAGS) -c $<
+
%.mysql.o: %.cpp
- $(C++) -o $@ $(CFLAGS) -DBNBT_MYSQL -c $<
-+ $(CXX) -o $@ $(CPPFLAGS) $(CFLAGS) -DBNBT_MYSQL -c $<
-
++ $(CXX) -o $@ $(CFLAGS) -DBNBT_MYSQL -c $<
+
./bnbt: $(OBJS) $(OBJS_BNBT)
-
-@@ -91,4 +91,4 @@ bnbt.mysql.o: bnbt.h bnbt_mysql.h config
+
+@@ -91,4 +90,4 @@ bnbt.mysql.o: bnbt.h bnbt_mysql.h config
bnbt_mysql.mysql.o: bnbt.h bnbt_mysql.h util.h
tracker.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h config.h md5.h server.h sort.h tracker.h util.h
tracker_announce.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h link.h tracker.h util.h
diff --git a/package/cpufrequtils/patches/patch-Makefile b/package/cpufrequtils/patches/patch-Makefile
index 2aec7173f..8e1093656 100644
--- a/package/cpufrequtils/patches/patch-Makefile
+++ b/package/cpufrequtils/patches/patch-Makefile
@@ -1,5 +1,5 @@
--- cpufrequtils-007.orig/Makefile 2010-01-16 14:47:44.000000000 +0100
-+++ cpufrequtils-007/Makefile 2010-02-05 18:20:59.944334337 +0100
++++ cpufrequtils-007/Makefile 2010-02-11 20:37:45.000000000 +0100
@@ -27,11 +27,11 @@
DEBUG ?= false
@@ -25,7 +25,12 @@
PACKAGE = cpufrequtils
PACKAGE_BUGREPORT = cpufreq@vger.kernel.org
LANGUAGES = de fr it cs pt
-@@ -80,7 +82,6 @@ INSTALL = /usr/bin/install -c
+@@ -76,16 +78,16 @@ confdir ?= /etc/
+
+ # Toolchain: what tools do we use, and what options do they need:
+
++CP = cp -fpR
+ INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
@@ -33,7 +38,13 @@
# If you are running a cross compiler, you may want to set this
# to something more interesting, like "arm-linux-". If you want
-@@ -116,20 +117,22 @@ WARNINGS += -Wshadow
+ # to compile vs uClibc, that can be done here as well.
+-CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
++CROSS ?= #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
+ CC = $(CROSS)gcc
+ LD = $(CROSS)gcc
+ AR = $(CROSS)ar
+@@ -116,20 +118,22 @@ WARNINGS += -Wshadow
CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \
-DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE
@@ -61,7 +72,7 @@
CPPFLAGS += -DINTERFACE_SYSFS
endif
-@@ -147,11 +150,9 @@ CFLAGS += $(WARNINGS)
+@@ -147,11 +151,9 @@ CFLAGS += $(WARNINGS)
ifeq ($(strip $(V)),false)
QUIET=@$(PWD)/build/ccdv
@@ -73,7 +84,7 @@
HOST_PROGS=
endif
-@@ -175,24 +176,26 @@ all: ccdv libcpufreq utils $(COMPILE_NLS
+@@ -175,31 +177,32 @@ all: ccdv libcpufreq utils $(COMPILE_NLS
ccdv: build/ccdv
build/ccdv: build/ccdv.c
@echo "Building ccdv"
@@ -102,13 +113,22 @@
+libcpufreq: libcpufreq.so.$(LIB_MAJ)
-cpufreq-%: libcpufreq.la $(UTIL_OBJS)
-+cpufreq-%: libcpufreq.so.$(LIB_MAJ) $(UTIL_OBJS)
++cpufreq-%: libcpufreq.so.$(LIB_MAJ) $(UTIL_SRC)
$(QUIET) $(CC) $(CPPFLAGS) $(CFLAGS) -I. -I./lib/ -c -o utils/$@.o utils/$*.c
- $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -L. -L./.libs/ -o $@ utils/$@.o -lcpufreq
+- $(QUIET) $(STRIPCMD) $@
+ $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ utils/$@.o -lcpufreq
- $(QUIET) $(STRIPCMD) $@
utils: cpufreq-info cpufreq-set cpufreq-aperf
+
+-po/$(PACKAGE).pot: $(UTIL_OBJS)
++po/$(PACKAGE).pot: $(UTIL_SRC)
+ @xgettext --default-domain=$(PACKAGE) --add-comments \
+- --keyword=_ --keyword=N_ $(UTIL_OBJS) && \
++ --keyword=_ --keyword=N_ $(UTIL_SRC) && \
+ test -f $(PACKAGE).po && \
+ mv -f $(PACKAGE).po po/$(PACKAGE).pot
+
@@ -217,22 +220,21 @@ update-gmo: po/$(PACKAGE).pot
done;
@@ -133,19 +153,22 @@
install-lib:
$(INSTALL) -d $(DESTDIR)${libdir}
- $(LIBTOOL) --mode=install $(INSTALL) libcpufreq.la $(DESTDIR)${libdir}/libcpufreq.la
-+ cp -Rp libcpufreq.so* $(DESTDIR)${libdir}/
++ $(CP) libcpufreq.so* $(DESTDIR)${libdir}/
$(INSTALL) -d $(DESTDIR)${includedir}
$(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h
-@@ -255,7 +257,7 @@ install-gmo:
+@@ -255,9 +257,9 @@ install-gmo:
install-bench:
@#DESTDIR must be set from outside to survive
- @sbindir=$(sbindir) bindir=$(bindir) docdir=$(docdir) confdir=$(confdir) make -C bench install
+ @sbindir=$(sbindir) bindir=$(bindir) docdir=$(docdir) confdir=$(confdir) $(MAKE) -C bench install
- install: install-lib install-tools install-man $(INSTALL_NLS) $(INSTALL_BENCH)
+-install: install-lib install-tools install-man $(INSTALL_NLS) $(INSTALL_BENCH)
++install: all install-lib install-tools $(INSTALL_NLS) $(INSTALL_BENCH)
+ uninstall:
+ -rm -f $(DESTDIR)${libdir}/libcpufreq.*
@@ -271,5 +273,5 @@ uninstall:
rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpufrequtils.mo; \
done;
diff --git a/package/cpufrequtils/patches/patch-bench_Makefile b/package/cpufrequtils/patches/patch-bench_Makefile
index 08b0049ca..d0b5769a7 100644
--- a/package/cpufrequtils/patches/patch-bench_Makefile
+++ b/package/cpufrequtils/patches/patch-bench_Makefile
@@ -1,5 +1,5 @@
--- cpufrequtils-007.orig/bench/Makefile 2010-01-16 14:47:44.000000000 +0100
-+++ cpufrequtils-007/bench/Makefile 2010-01-23 18:51:28.329986048 +0100
++++ cpufrequtils-007/bench/Makefile 2010-02-11 20:32:30.000000000 +0100
@@ -1,4 +1,4 @@
-LIBS = -L../.libs/ -lm -lcpufreq
+LIBS = -L../ -lm -lcpufreq
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index b96a92e8f..a1e9e9440 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -33,10 +33,6 @@ if [[ -n $ADK_NATIVE ]];then
fi
fi
-if [[ -n $ADK_PACKAGE_RUBY ]]; then
- NEED_RUBY="$NEED_RUBY ruby"
-fi
-
if [[ -n $ADK_PACKAGE_LIBUSB ]]; then
NEED_BISON="$NEED_BISON libusb"
fi