Hi,
many thanks for committing the patch .. I just noticed that the TABs in
Makefile's
had been converted into space, meaning that the current svn does not build at
the moment ..
I have fixed this by converting the spaces back to TAB, and this time the patch
is
attached in the email (i.e. not inline) ..
Signed-Off-By: Alfred E. Heggestad <a...@db.org>
On 12/17/10 2:31 PM, Outback Dingo wrote:
Committed revision 24640
On Wed, Dec 15, 2010 at 5:38 PM, Alfred E. Heggestad <a...@db.org
<mailto:a...@db.org>> wrote:
On 12/14/10 2:40 AM, Jo-Philipp Wich wrote:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hey,
the patch looks clean so far but I don't like the idea of conditional
compilation. For the initial version its okay to always mandate libspeex
etc. and make it a static DEPENDS:=... .
In a later version you should maybe look into providing a "full" and
"mini" variant of your package, or even better, make the code parts
requiring speex etc. loadable libraries. Of course I cannot judge how
much effort this would be, but maybe consider it.
Hi,
thanks for your feedback, I have removed the conditional compilation as you
mentioned, they should not be needed for this initial version ...
the applications baresip and restund are already fully modular, and each
module
can either be statically linked into the main application, or loaded
dynamically.
I think that we can add extra packages later, to extend functionality ..
Index: net/restund/Makefile
===================================================================
--- net/restund/Makefile (revision 24640)
+++ net/restund/Makefile (working copy)
@@ -27,26 +27,26 @@
#PKG_MAKE_OPTS += USE_MYSQL=
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- CC="$(TARGET_CC)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- $(PKG_MAKE_OPTS) \
- SYSROOT="$(TOOLCHAIN_DIR)" \
- SYSROOT_ALT="$(STAGING_DIR)/usr" \
- RELEASE=1 \
- all install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ CC="$(TARGET_CC)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ $(PKG_MAKE_OPTS) \
+ SYSROOT="$(TOOLCHAIN_DIR)" \
+ SYSROOT_ALT="$(STAGING_DIR)/usr" \
+ RELEASE=1 \
+ all install
endef
define Package/restund/install
- $(INSTALL_DIR) $(1)/usr/sbin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/restund $(1)/usr/sbin/
- $(INSTALL_DIR) $(1)/usr/lib/$(PKG_NAME)/modules
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME)/modules/*.so
$(1)/usr/lib/$(PKG_NAME)/modules/.
- $(INSTALL_DIR) $(1)/etc
- $(INSTALL_CONF) $(PKG_BUILD_DIR)/etc/restund.conf $(1)/etc/
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/restund.init $(1)/etc/init.d/restund
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/restund $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/lib/$(PKG_NAME)/modules
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME)/modules/*.so
$(1)/usr/lib/$(PKG_NAME)/modules/.
+ $(INSTALL_DIR) $(1)/etc
+ $(INSTALL_CONF) $(PKG_BUILD_DIR)/etc/restund.conf $(1)/etc/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) ./files/restund.init $(1)/etc/init.d/restund
endef
$(eval $(call BuildPackage,restund))
Index: net/baresip/Makefile
===================================================================
--- net/baresip/Makefile (revision 24640)
+++ net/baresip/Makefile (working copy)
@@ -27,30 +27,30 @@
endef
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- MOD_AUTODETECT= \
- USE_G711=1 USE_L16=1 \
- USE_STDIO=1 USE_CONS=1 USE_EVDEV=1 \
- USE_OSS=1 \
- CC="$(TARGET_CC)" \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \
- $(PKG_MAKE_OPTS) \
- SYSROOT="$(TOOLCHAIN_DIR)" \
- SYSROOT_ALT="$(STAGING_DIR)/usr" \
- RELEASE=1 \
- all install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ MOD_AUTODETECT= \
+ USE_G711=1 USE_L16=1 \
+ USE_STDIO=1 USE_CONS=1 USE_EVDEV=1 \
+ USE_OSS=1 \
+ CC="$(TARGET_CC)" \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \
+ $(PKG_MAKE_OPTS) \
+ SYSROOT="$(TOOLCHAIN_DIR)" \
+ SYSROOT_ALT="$(STAGING_DIR)/usr" \
+ RELEASE=1 \
+ all install
endef
define Package/baresip/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/baresip $(1)/usr/bin/
- $(INSTALL_DIR) $(1)/usr/lib/baresip/modules
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/*.so
$(1)/usr/lib/baresip/modules/.
- $(INSTALL_DIR) $(1)/usr/share/baresip
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/baresip/*
$(1)/usr/share/baresip/.
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/baresip.init $(1)/etc/init.d/baresip
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/baresip $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/lib/baresip/modules
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/*.so
$(1)/usr/lib/baresip/modules/.
+ $(INSTALL_DIR) $(1)/usr/share/baresip
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/baresip/*
$(1)/usr/share/baresip/.
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) ./files/baresip.init $(1)/etc/init.d/baresip
endef
$(eval $(call BuildPackage,baresip))
Index: libs/re/Makefile
===================================================================
--- libs/re/Makefile (revision 24640)
+++ libs/re/Makefile (working copy)
@@ -25,40 +25,40 @@
endef
define Package/libre/description
- Generic library for real-time communications with async IO support.
+ Generic library for real-time communications with async IO support.
endef
TARGET_CFLAGS += $(FPIC)
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- HAVE_LIBRESOLV= \
- CC="$(TARGET_CC)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \
- EXTRA_LFLAGS="-lm" \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- SYSROOT="$(TOOLCHAIN_DIR)" \
- SYSROOT_ALT="$(STAGING_DIR)/usr" \
- RELEASE=1 \
- all install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ HAVE_LIBRESOLV= \
+ CC="$(TARGET_CC)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \
+ EXTRA_LFLAGS="-lm" \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ SYSROOT="$(TOOLCHAIN_DIR)" \
+ SYSROOT_ALT="$(STAGING_DIR)/usr" \
+ RELEASE=1 \
+ all install
endef
define Build/InstallDev
- mkdir -p $(1)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/re $(1)/usr/include/
- mkdir -p $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so*} $(1)/usr/lib/
+ mkdir -p $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/re $(1)/usr/include/
+ mkdir -p $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so*} $(1)/usr/lib/
endef
define Build/UninstallDev
- rm -rf \
- $(STAGING_DIR)/usr/include/re \
- $(STAGING_DIR)/usr/lib/libre.{a,so*}
+ rm -rf \
+ $(STAGING_DIR)/usr/include/re \
+ $(STAGING_DIR)/usr/lib/libre.{a,so*}
endef
define Package/libre/install
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so* $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libre))
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
