add bitlbee and libiconv from Erik Bosman, thx. fix some depends for cbtt and bitchx

SVN-Revision: 3375
master
Waldemar Brodkorb 19 years ago
parent 48069eee67
commit 76356565c0
  1. 2
      openwrt/package/Config.in
  2. 3
      openwrt/package/Makefile
  3. 1
      openwrt/package/bitchx/Config.in
  4. 16
      openwrt/package/bitlbee/Config.in
  5. 67
      openwrt/package/bitlbee/Makefile
  6. 3
      openwrt/package/bitlbee/files/S55bitlbee
  7. 3
      openwrt/package/bitlbee/ipkg/bitlbee.conffiles
  8. 5
      openwrt/package/bitlbee/ipkg/bitlbee.control
  9. 98
      openwrt/package/bitlbee/patches/100-cross_compile_configure_fix
  10. 3
      openwrt/package/cbtt/Config.in
  11. 13
      openwrt/package/libiconv/Config.in
  12. 87
      openwrt/package/libiconv/Makefile
  13. 4
      openwrt/package/libiconv/ipkg/libiconv.control
  14. 2962
      openwrt/package/libiconv/patches/100-strip_charsets.patch

@ -58,6 +58,7 @@ source "package/asterisk/Config.in"
source "package/atftp/Config.in"
source "package/avahi/Config.in"
source "package/bind/Config.in"
source "package/bitlbee/Config.in"
source "package/bwm/Config.in"
source "package/chillispot/Config.in"
source "package/cifsmount/Config.in"
@ -217,6 +218,7 @@ source "package/gmp/Config.in" # libgmp
source "package/gnutls/Config.in" ## libgnutls
source "package/libgpg-error/Config.in"
source "package/gsm/Config.in" # libgsm
source "package/libiconv/Config.in"
source "package/libid3tag/Config.in"
source "package/jpeg/Config.in" # libjpeg
source "package/libtool/Config.in" # libltdl

@ -14,6 +14,7 @@ package-$(BR2_COMPILE_AVAHI) += avahi
package-$(BR2_COMPILE_BC) += bc
package-$(BR2_COMPILE_BIND) += bind
package-$(BR2_PACKAGE_BITCHX) += bitchx
package-$(BR2_PACKAGE_BITCHX) += bitlbee
package-$(BR2_PACKAGE_BLUEZ_LIBS) += bluez-libs
package-$(BR2_PACKAGE_BLUEZ_UTILS) += bluez-utils
package-$(BR2_PACKAGE_BRIDGE) += bridge
@ -102,6 +103,7 @@ package-$(BR2_PACKAGE_LIBGCRYPT) += libgcrypt
package-$(BR2_PACKAGE_LIBGD) += libgd
package-$(BR2_PACKAGE_LIBGDBM) += libgdbm
package-$(BR2_PACKAGE_LIBGPG_ERROR) += libgpg-error
package-$(BR2_PACKAGE_LIBICONV) += libiconv
package-$(BR2_PACKAGE_LIBID3TAG) += libid3tag
package-$(BR2_PACKAGE_LIBLZO) += liblzo
package-$(BR2_PACKAGE_LIBMAD) += libmad
@ -286,6 +288,7 @@ atftp-compile: readline-compile
avahi-compile: libdaemon-compile expat-compile libgdbm-compile
bind-compile: openssl-compile
bitchx-compile: ncurses-compile
bitlbee-compile: libiconv-compile openssl-compile glib-compile
cbtt-compile: mysql-compile zlib-compile
clinkc-compile: expat-compile
curl-compile: openssl-compile zlib-compile

@ -2,6 +2,7 @@ config BR2_PACKAGE_BITCHX
prompt "BitchX............................ popular IRC client"
tristate
default m if CONFIG_DEVEL
select BR2_PACKAGE_LIBNCURSES
help
A popular IRC client

@ -0,0 +1,16 @@
config BR2_PACKAGE_BITLBEE
prompt "BitlBee........................... IRC gateway to IM chat networks"
tristate
default m if CONFIG_DEVEL
select BR2_PACKAGE_LIBOPENSSL
select BR2_PACKAGE_LIBGLIB
select BR2_PACKAGE_LIBICONV
help
BitlBee is an IRC daemon that can talk to instant messaging
networks and acts as a gateway. Users can connect to the
server with any normal IRC client and see their 'buddy list'
in #bitlbee.
http://www.bitlbee.org/

@ -0,0 +1,67 @@
# $Id$
include $(TOPDIR)/rules.mk
PKG_NAME:=bitlbee
PKG_VERSION:=1.0.1
PKG_RELEASE:=1
PKG_MD5SUM:=a4d7daa9b64898dd41a3a6d104692d9a
PKG_SOURCE_URL:=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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,BITLBEE,bitlbee,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
STAGING_DIR="$(STAGING_DIR)" \
STRIP="$(STRIP)" \
./configure \
--prefix=/usr/ \
--bindir=/usr/sbin/ \
--etcdir=/etc/bitlbee/ \
--datadir=/usr/share/bitlbee/ \
--config=/var/lib/bitlbee/ \
--arch=OpenWrt \
--cpu="$(ARCH)" \
--debug=0 \
--strip=1 \
--sizeopt=1 \
--ipv6=1 \
--ssl=openssl \
--glib1=1 \
--glib1prefix="$(STAGING_DIR)/usr" \
);
touch $@
$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR)
touch $@
$(IPKG_BITLBEE):
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(IDIR_BITLBEE)" install-etc install-bin
$(MAKE) -C $(PKG_BUILD_DIR)/doc/user-guide \
DESTDIR="$(IDIR_BITLBEE)" install
install -d -m0755 $(IDIR_BITLBEE)/etc/init.d
install -m0755 ./files/S55bitlbee $(IDIR_BITLBEE)/etc/init.d/S55bitlbee
$(IPKG_BUILD) $(IDIR_BITLBEE) $(PACKAGE_DIR)
touch $@
mostlyclean:
$(MAKE) -C $(PKG_BUILD_DIR) clean
rm -f $(PKG_BUILD_DIR)/.built

@ -0,0 +1,3 @@
#!/bin/sh
mkdir -p /var/lib/bitlbee
bitlbee -D

@ -0,0 +1,3 @@
/etc/bitlbee/motd.txt
/etc/bitlbee/bitlbee.conf
/etc/init.d/S55bitlbee

@ -0,0 +1,5 @@
Package: bitlbee
Priority: optional
Section: net
Depends: glib1, libopenssl, libiconv
Description: IRC gateway to IM chat networks

@ -0,0 +1,98 @@
diff -Nur bitlbee-1.0.1-orig/configure bitlbee-1.0.1/configure
--- bitlbee-1.0.1-orig/configure 2006-01-14 16:14:05.000000000 +0100
+++ bitlbee-1.0.1/configure 2006-03-06 18:30:19.000000000 +0100
@@ -21,9 +21,12 @@
debug=0
strip=1
+sizeopt=0
ipv6=1
ssl=auto
+glib1=0
+
arch=`uname -s`
cpu=`uname -m`
@@ -52,11 +55,18 @@
--debug=0/1 Disable/enable debugging $debug
--strip=0/1 Disable/enable binary stripping $strip
+--sizeopt=0/1 Disable/enable size optimization $sizeopt
+
+--arch=... Describe Operating System ?! $arch
+--cpu=... Describe CPU $cpu
--ipv6=0/1 IPv6 socket support $ipv6
--ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto)
$ssl
+--glib1=0/1 Force usage of glib1 even if glib2 is present
+--glib1prefix=...
+
EOF
exit;
fi
@@ -110,8 +120,13 @@
echo 'CFLAGS=-g' >> Makefile.settings
echo 'DEBUG=1' >> Makefile.settings
echo '#define DEBUG' >> config.h
+ if [ "$sizeopt" = "1" ]; then
+ echo "Warning: won't optimize for size since debug is on."
+ fi
+elif [ "$sizeopt" = "1" ]; then
+ echo 'CFLAGS=-Os' >> Makefile.settings
else
- echo 'CFLAGS=-O3' >> Makefile.settings
+ echo 'CFLAGS=-O2' >> Makefile.settings
fi
echo CFLAGS+=-I`pwd` -I`pwd`/protocols -I. >> Makefile.settings
@@ -138,24 +153,33 @@
exit 1;
fi
-if type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then
+if [ "$glib1" != "1" ] && \
+ type pkg-config > /dev/null 2>/dev/null && pkg-config glib-2.0; then
cat<<EOF>>Makefile.settings
EFLAGS+=`pkg-config --libs glib-2.0`
CFLAGS+=`pkg-config --cflags glib-2.0`
EOF
echo '#define GLIB2' >> config.h
-elif type glib-config > /dev/null 2> /dev/null; then
+elif [ "x$glib1prefix" = "x" ] && \
+ type glib-config > /dev/null 2> /dev/null; then
cat<<EOF>>Makefile.settings
EFLAGS+=`glib-config --libs`
CFLAGS+=`glib-config --cflags`
EOF
echo '#define GLIB1' >> config.h
+elif [ "x$glib1prefix" != "x" ] && \
+ type "$glib1prefix/bin/glib-config" > /dev/null 2> /dev/null; then
+ cat<<EOF>>Makefile.settings
+EFLAGS+=`$glib1prefix/bin/glib-config --prefix=$glib1prefix --libs`
+CFLAGS+=`$glib1prefix/bin/glib-config --prefix=$glib1prefix --cflags`
+EOF
+ echo '#define GLIB1' >> config.h
else
echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
exit 1;
fi
-if [ -r /usr/include/iconv.h ]; then
+if [ -r "$STAGING_DIR/usr/include/iconv.h" ]; then
:;
elif [ -r /usr/local/include/iconv.h ]; then
echo CFLAGS+=-I/usr/local/include >> Makefile.settings;
@@ -360,6 +384,10 @@
CYGWIN* )
echo 'Cygwin is not officially supported.'
;;
+OpenWrt )
+ echo 'EFLAGS+=-liconv' >> Makefile.settings;
+ echo "CFLAGS+=\"-I$STAGING_DIR/usr/include\"" >> Makefile.settings;
+;;
* )
echo 'We haven'\''t tested BitlBee on many platforms yet, yours is untested. YMMV.'
echo 'Please report any problems at http://bugs.bitlbee.org/.'

@ -2,6 +2,7 @@ config BR2_PACKAGE_CBTT
prompt "cbtt.............................. a C BitTorrent Tracker"
tristate
default m if CONFIG_DEVEL
select BR2_PACKAGE_ZLIB
help
A C BitTorrent Tracker
@ -9,5 +10,7 @@ config BR2_PACKAGE_CBTT_MYSQL
prompt "cbtt-mysql........................ a C BitTorrent Tracker (mysql)"
tristate
default m if CONFIG_DEVEL
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LIBMYSQLCLIENT
help
A C BitTorrent Tracker

@ -0,0 +1,13 @@
config BR2_PACKAGE_LIBICONV
prompt "libiconv.......................... character set conversion library"
tristate
default m if CONFIG_DEVEL
help
This package contains a _very_ stripped down version of GNU Libiconv,
all charsets have been removed, except ASCII, various unicode charsets
and iso8896-1.
The original website:
http://www.gnu.org/software/libiconv/

@ -0,0 +1,87 @@
# $Id4
include $(TOPDIR)/rules.mk
PKG_NAME:=libiconv
PKG_VERSION:=1.9.1
PKG_RELEASE:=1
PKG_MD5SUM:=0c99a05e0c3c153bac1c960f78711155
PKG_SOURCE_URL:=@GNU/libiconv
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBICONV,libiconv,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--program-prefix="" \
--program-suffix="" \
--prefix=/usr \
--exec-prefix=/usr \
--bindir=/usr/bin \
--datadir=/usr/share \
--includedir=/usr/include \
--infodir=/usr/share/info \
--libdir=/usr/lib \
--libexecdir=/usr/lib \
--localstatedir=/var \
--mandir=/usr/share/man \
--sbindir=/usr/sbin \
--sysconfdir=/etc \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
);
touch $@
$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR) \
CC=$(TARGET_CC)
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
libdir="$(PKG_INSTALL_DIR)/usr/lib" \
includedir="$(PKG_INSTALL_DIR)/usr/include" \
install-lib
touch $@
$(IPKG_LIBICONV):
install -d -m0755 $(IDIR_LIBICONV)/usr/lib
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(IDIR_LIBICONV)/usr/lib/
chmod 0644 $(IDIR_LIBICONV)/usr/lib/*
$(RSTRIP) $(IDIR_LIBICONV)
$(IPKG_BUILD) $(IDIR_LIBICONV) $(PACKAGE_DIR)
$(STAGING_DIR)/usr/lib/libiconv.so: $(PKG_BUILD_DIR)/.built
mkdir -p $(STAGING_DIR)/usr/include
cp -fpR $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/include/
mkdir -p $(STAGING_DIR)/usr/lib/
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libiconv.* $(STAGING_DIR)/usr/lib/
touch $@
install-dev: $(STAGING_DIR)/usr/lib/libiconv.so
uninstall-dev:
rm -rf \
$(STAGING_DIR)/usr/include/iconv.h \
$(STAGING_DIR)/usr/lib/libiconv.* \
compile: install-dev
clean: uninstall-dev
mostlyclean:
$(MAKE) -C $(PKG_BUILD_DIR) clean
rm -f $(PKG_BUILD_DIR)/.built

@ -0,0 +1,4 @@
Package: libiconv
Priority: optional
Section: libs
Description: character set conversion library

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save