From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/bitlbee/Makefile | 36 ++++++++-------------- package/bitlbee/patches/patch-Makefile | 22 ------------- package/bitlbee/patches/patch-configure | 1 - package/bitlbee/patches/patch-lib_Makefile | 24 --------------- package/bitlbee/patches/patch-protocols_Makefile | 24 --------------- .../patches/patch-protocols_jabber_Makefile | 22 ------------- .../bitlbee/patches/patch-protocols_msn_Makefile | 24 --------------- .../bitlbee/patches/patch-protocols_oscar_Makefile | 22 ------------- .../bitlbee/patches/patch-protocols_yahoo_Makefile | 22 ------------- 9 files changed, 12 insertions(+), 185 deletions(-) delete mode 100644 package/bitlbee/patches/patch-Makefile delete mode 100644 package/bitlbee/patches/patch-lib_Makefile delete mode 100644 package/bitlbee/patches/patch-protocols_Makefile delete mode 100644 package/bitlbee/patches/patch-protocols_jabber_Makefile delete mode 100644 package/bitlbee/patches/patch-protocols_msn_Makefile delete mode 100644 package/bitlbee/patches/patch-protocols_oscar_Makefile delete mode 100644 package/bitlbee/patches/patch-protocols_yahoo_Makefile (limited to 'package/bitlbee') diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 8efc3c104..a0fbdab1a 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -4,33 +4,24 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bitlbee -PKG_VERSION:= 1.2.3 +PKG_VERSION:= 1.2.4 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libiconv openssl glib -PKG_MD5SUM:= 2b1674d98804970809de3da3edf0bed2 +PKG_MD5SUM:= 26b9bfc5446bdf0e932e8074d117be67 PKG_DESCR:= IRC gateway to IM chat networks PKG_SECTION:= net -PKG_DEPENDS:= glib libopenssl libiconv +PKG_DEPENDS:= glib libiconv libopenssl +PKG_BUILDDEP+= glib libiconv openssl PKG_URL:= http://www.bitlbee.org -PKG_SITES:= http://get.bitlbee.org/src/ \ - http://get.bitlbee.be/src/ \ - http://get.us.bitlbee.org/src/ \ - http://ftp.snt.utwente.nl/pub/software/bitlbee/src/ +PKG_SITES:= http://get.bitlbee.org/src/ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -do-configure: - (cd $(WRKBUILD); \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -fPIC" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ - STAGING_DIR="$(STAGING_DIR)" \ - STRIP="$(STRIP)" \ - ./configure \ - --target=${REAL_GNU_TARGET_NAME} \ +CONFIG_STYLE:= minimal + +TCFLAGS+= -fPIC +CONFIGURE_ARGS:= --target=${REAL_GNU_TARGET_NAME} \ --prefix=/usr/ \ --bindir=/usr/sbin/ \ --etcdir=/etc/bitlbee/ \ @@ -39,19 +30,16 @@ do-configure: --arch=Linux \ --cpu="${ARCH}" \ --debug=0 \ - --strip=1 \ + --strip=0 \ --ipv6=1 \ - --ssl=openssl \ - ); + --ssl=openssl -BUILD_STYLE:= auto -INSTALL_STYLE:= auto INSTALL_TARGET= install-etc install-bin post-configure: @echo 'CFLAGS+="-I${STAGING_DIR}/usr/include/iconv"' >> \ ${WRKBUILD}/Makefile.settings - @echo 'LFLAGS+="-L${STAGING_DIR}/usr/lib/iconv"' >> \ + @echo 'LFLAGS+="-L${STAGING_DIR}/usr/lib"' >> \ ${WRKBUILD}/Makefile.settings post-install: diff --git a/package/bitlbee/patches/patch-Makefile b/package/bitlbee/patches/patch-Makefile deleted file mode 100644 index 8269d1977..000000000 --- a/package/bitlbee/patches/patch-Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- bitlbee-1.2.3.orig/Makefile 2008-09-06 14:33:14.000000000 +0200 -+++ bitlbee-1.2.3/Makefile 2009-08-28 11:18:09.268088045 +0200 -@@ -111,16 +111,16 @@ $(subdirs): - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ - - $(objects): Makefile Makefile.settings config.h - - $(OUTFILE): $(objects) $(subdirs) - @echo '*' Linking $(OUTFILE) -- @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LFLAGS) $(EFLAGS) -+ $(CC) -shared $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS) $(EFLAGS) - ifndef DEBUG - @echo '*' Stripping $(OUTFILE) -- @-$(STRIP) $(OUTFILE) -+ -$(STRIP) $(OUTFILE) - endif - - encode: crypting.c diff --git a/package/bitlbee/patches/patch-configure b/package/bitlbee/patches/patch-configure index 9f13c535c..1f4538ac4 100644 --- a/package/bitlbee/patches/patch-configure +++ b/package/bitlbee/patches/patch-configure @@ -1,4 +1,3 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- bitlbee-1.2.3.orig/configure 2008-09-06 14:33:13.000000000 +0200 +++ bitlbee-1.2.3/configure 2008-10-08 16:07:32.000000000 +0200 @@ -19,7 +19,6 @@ libevent='/usr/' diff --git a/package/bitlbee/patches/patch-lib_Makefile b/package/bitlbee/patches/patch-lib_Makefile deleted file mode 100644 index e43ddb2a0..000000000 --- a/package/bitlbee/patches/patch-lib_Makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- bitlbee-1.2.3.orig/lib/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/lib/Makefile 2009-08-28 11:12:29.546939473 +0200 -@@ -12,7 +12,7 @@ - objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o - - CFLAGS += -Wall --LFLAGS += -r -+#LFLAGS += -r - - # [SH] Phony targets - all: lib.o -@@ -32,10 +32,10 @@ distclean: clean $(subdirs) - - lib.o: $(objects) $(subdirs) - @echo '*' Linking lib.o -- @$(LD) $(LFLAGS) $(objects) -o lib.o -+ $(CC) -shared $(LDFLAGS) $(objects) -o lib.o - - $(objects): ../Makefile.settings Makefile - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile deleted file mode 100644 index 9e0f621f9..000000000 --- a/package/bitlbee/patches/patch-protocols_Makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- bitlbee-1.2.3.orig/protocols/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/protocols/Makefile 2009-08-28 11:13:32.079800935 +0200 -@@ -21,7 +21,7 @@ subdirobjs = $(PROTOOBJS) - # Expansion of variables - subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs))) - CFLAGS += -Wall --LFLAGS += -r -+#LFLAGS += -r - - # [SH] Phony targets - all: protocols.o -@@ -44,10 +44,10 @@ $(subdirs): - - protocols.o: $(objects) $(subdirs) - @echo '*' Linking protocols.o -- @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o -+ $(CC) -shared $(LDFLAGS) $(objects) $(subdirobjs) -o protocols.o - - $(objects): ../Makefile.settings Makefile - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ diff --git a/package/bitlbee/patches/patch-protocols_jabber_Makefile b/package/bitlbee/patches/patch-protocols_jabber_Makefile deleted file mode 100644 index 5bf35809d..000000000 --- a/package/bitlbee/patches/patch-protocols_jabber_Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- bitlbee-1.2.3.orig/protocols/jabber/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/protocols/jabber/Makefile 2009-08-28 11:15:01.100110500 +0200 -@@ -12,7 +12,7 @@ - objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o - - CFLAGS += -Wall --LFLAGS += -r -+#LFLAGS += -r - - # [SH] Phony targets - all: jabber_mod.o -@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ - - jabber_mod.o: $(objects) - @echo '*' Linking jabber_mod.o -- @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o -+ $(CC) -shared $(LDFLAGS) $(objects) -o jabber_mod.o diff --git a/package/bitlbee/patches/patch-protocols_msn_Makefile b/package/bitlbee/patches/patch-protocols_msn_Makefile deleted file mode 100644 index df4370d39..000000000 --- a/package/bitlbee/patches/patch-protocols_msn_Makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- bitlbee-1.2.3.orig/protocols/msn/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/protocols/msn/Makefile 2009-08-28 11:13:50.455844911 +0200 -@@ -12,7 +12,7 @@ - objects = msn.o msn_util.o ns.o passport.o sb.o tables.o - - CFLAGS += -Wall --LFLAGS += -r -+#LFLAGS += -r - - # [SH] Phony targets - all: msn_mod.o -@@ -34,10 +34,10 @@ $(objects): ../../Makefile.settings Make - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ - - msn_mod.o: $(objects) - @echo '*' Linking msn_mod.o -- @$(LD) $(LFLAGS) $(objects) -o msn_mod.o -+ $(CC) -shared $(LDFLAGS) $(objects) -o msn_mod.o - - diff --git a/package/bitlbee/patches/patch-protocols_oscar_Makefile b/package/bitlbee/patches/patch-protocols_oscar_Makefile deleted file mode 100644 index 2ff710800..000000000 --- a/package/bitlbee/patches/patch-protocols_oscar_Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- bitlbee-1.2.3.orig/protocols/oscar/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/protocols/oscar/Makefile 2009-08-28 11:16:04.032452435 +0200 -@@ -12,7 +12,7 @@ - objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o - - CFLAGS += -Wall --LFLAGS += -r -+#LFLAGS += -r - - # [SH] Phony targets - all: oscar_mod.o -@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ - - oscar_mod.o: $(objects) - @echo '*' Linking oscar_mod.o -- @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o -+ $(CC) -shared $(LDFLAGS) $(objects) -o oscar_mod.o diff --git a/package/bitlbee/patches/patch-protocols_yahoo_Makefile b/package/bitlbee/patches/patch-protocols_yahoo_Makefile deleted file mode 100644 index 51a294aa8..000000000 --- a/package/bitlbee/patches/patch-protocols_yahoo_Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- bitlbee-1.2.3.orig/protocols/yahoo/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/protocols/yahoo/Makefile 2009-08-28 11:14:08.877306693 +0200 -@@ -12,7 +12,7 @@ - objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o - - CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB --LFLAGS += -r -+#LFLAGS += -r - - # [SH] Phony targets - all: yahoo_mod.o -@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ - - yahoo_mod.o: $(objects) - @echo '*' Linking yahoo_mod.o -- @$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o -+ $(CC) -shared $(LDFLAGS) $(objects) -o yahoo_mod.o -- cgit v1.2.3