[Astlinux-commits] SF.net SVN: astlinux: [181] trunk/package

[<kr...@us...>]

Revision: 181
Author:   krisk84
Date:     2006-07-12 11:28:30 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/astlinux/?rev=181&view=rev

Log Message:
-----------
Asterisk postgres support

Modified Paths:
--------------
    trunk/package/Config.in
    trunk/package/asterisk/Config.in
    trunk/package/asterisk/asterisk.mk

Added Paths:
-----------
    trunk/package/asterisk/custom/
    trunk/package/asterisk/custom/Makefile.patch
    trunk/package/libpq/
    trunk/package/libpq/Config.in
    trunk/package/libpq/libpq.mk
Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in	2006-07-11 12:34:38 UTC (rev 180)
+++ trunk/package/Config.in	2006-07-12 18:28:30 UTC (rev 181)
@@ -78,6 +78,7 @@
 source "package/libmad/Config.in"
 source "package/libpcap/Config.in"
 source "package/libpng/Config.in"
+source "package/libpq/Config.in"
 source "package/libpri/Config.in"
 source "package/libsysfs/Config.in"
 source "package/libtool/Config.in"

Modified: trunk/package/asterisk/Config.in
===================================================================
--- trunk/package/asterisk/Config.in	2006-07-11 12:34:38 UTC (rev 180)
+++ trunk/package/asterisk/Config.in	2006-07-12 18:28:30 UTC (rev 181)
@@ -24,6 +24,14 @@
         help
           Compile Asterisk with zaptel support
 
+config BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM
+        bool "Asterisk Custom PostgreSQL Support"
+        default n
+        depends BR2_PACKAGE_ASTERISK
+	select BR2_PACKAGE_LIBPQ
+        help
+          Compile Asterisk with custom PostgreSQL support
+
 config BR2_PACKAGE_ASTERISK_CHANSCCP
         bool "Asterisk chan_sccp Support"
         default n

Modified: trunk/package/asterisk/asterisk.mk
===================================================================
--- trunk/package/asterisk/asterisk.mk	2006-07-11 12:34:38 UTC (rev 180)
+++ trunk/package/asterisk/asterisk.mk	2006-07-12 18:28:30 UTC (rev 181)
@@ -20,6 +20,11 @@
 ASTERISK_EXTRAS+=zaptel
 endif
 
+ifeq ($(strip $(BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM)),y)
+ASTERISK_EXTRAS :=$(ASTERISK_EXTRAS)
+ASTERISK_EXTRAS+=libpq
+endif
+
 ifeq ($(strip $(BR2_PACKAGE_ASTERISK_LOWMEMORY)),y)
 ASTERISK_OPTIONS :=$(ASTERISK_OPTIONS)
 ASTERISK_OPTIONS+="-DLOW_MEMORY"
@@ -34,6 +39,8 @@
 	touch $(ASTERISK_DIR)/.source
 
 $(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.source
+	cp package/asterisk/custom/*.c $(ASTERISK_DIR)/apps/
+	patch $(ASTERISK_DIR)/apps/Makefile package/asterisk/custom/Makefile.patch
 	touch $(ASTERISK_DIR)/.configured
 
 $(ASTERISK_DIR)/$(ASTERISK_BINARY): $(ASTERISK_DIR)/.configured
@@ -66,7 +73,8 @@
 	chmod 640 $(TARGET_DIR)/stat/etc/asterisk/*
 	ln -sf /tmp/etc/asterisk $(TARGET_DIR)/etc/asterisk
 	ln -sf $(ASTERISK_DIR) $(BUILD_DIR)/asterisk
-
+	cp -f package/asterisk/custom/*.conf $(TARGET_DIR)/stat/etc/asterisk/
+	
 asterisk: uclibc libelf ncurses zlib openssl $(ASTERISK_EXTRAS) $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY)
 
 asterisk-source: $(DL_DIR)/$(ASTERISK_SOURCE)

Added: trunk/package/asterisk/custom/Makefile.patch
===================================================================
--- trunk/package/asterisk/custom/Makefile.patch	                        (rev 0)
+++ trunk/package/asterisk/custom/Makefile.patch	2006-07-12 18:28:30 UTC (rev 181)
@@ -0,0 +1,11 @@
+13a14,15
+> ASTPWD:=$(shell pwd)
+> 
+37c39
+< #APPS+=app_sql_postgres.so
+---
+> APPS+=app_sql_postgres.so
+109c111
+< 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq
+---
+> 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L$(ASTPWD)/../../root/lib -lpq

Added: trunk/package/libpq/Config.in
===================================================================
--- trunk/package/libpq/Config.in	                        (rev 0)
+++ trunk/package/libpq/Config.in	2006-07-12 18:28:30 UTC (rev 181)
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBPQ
+	bool "libpq"
+	default n
+	help
+		PostgreSQL Interface
+

Added: trunk/package/libpq/libpq.mk
===================================================================
--- trunk/package/libpq/libpq.mk	                        (rev 0)
+++ trunk/package/libpq/libpq.mk	2006-07-12 18:28:30 UTC (rev 181)
@@ -0,0 +1,77 @@
+#############################################################
+#
+# postgresql library
+#
+#############################################################
+LIBPQ_VERSION := 8.1.4
+LIBPQ_SOURCE := postgresql-$(LIBPQ_VERSION).tar.gz
+LIBPQ_SITE := ftp://ftp2.nl.postgresql.org/mirror/postgresql/source/v$(LIBPQ_VERSION)
+LIBPQ_DIR := $(BUILD_DIR)/postgresql-$(LIBPQ_VERSION)
+
+$(DL_DIR)/$(LIBPQ_SOURCE):
+	$(WGET) -P $(DL_DIR) $(LIBPQ_SITE)/$(LIBPQ_SOURCE)
+
+$(LIBPQ_DIR)/.source: $(DL_DIR)/$(LIBPQ_SOURCE)
+	zcat $(DL_DIR)/$(LIBPQ_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	# toolchain/patch-kernel.sh $(LIBPQ_DIR) package/postgresql/ postgresql\*.patch
+	touch $(LIBPQ_DIR)/.source
+
+$(LIBPQ_DIR)/.configured: $(LIBPQ_DIR)/.source
+	@mkdir -p $(STAGING_DIR)/usr/local/pgsql
+	(cd $(LIBPQ_DIR); \
+		./configure \
+		--prefix=$(STAGING_DIR)/usr/local/pgsql \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--disable-rpath \
+		--disable-largefile \
+		--enable-static \
+		--without-docdir \
+		--without-java \
+		--without-krb4 \
+		--without-krb5 \
+		--without-openssl \
+		--without-pam \
+		--without-perl \
+		--without-python \
+		--without-readline \
+		--without-rendezvous \
+		--without-tcl \
+		--without-tk \
+		--without-zlib \
+	);
+	touch $(LIBPQ_DIR)/.configured
+
+$(LIBPQ_DIR)/.build: $(LIBPQ_DIR)/.configured
+	$(MAKE1) -C $(LIBPQ_DIR)/src/include OSARCH=Linux CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) INSTALL_BASE=/ $(TARGET_CONFIGURE_OPTS)
+	$(MAKE1) -C $(LIBPQ_DIR)/src/interfaces/libpq OSARCH=Linux CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) INSTALL_BASE=/ $(TARGET_CONFIGURE_OPTS)
+	touch $(LIBPQ_DIR)/.build
+
+$(LIBPQ_DIR)/.installed: $(LIBPQ_DIR)/.build
+	$(MAKE1) -C $(LIBPQ_DIR)/src/include OSARCH=Linux CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) $(TARGET_CONFIGURE_OPTS) \
+	INSTALL_BASE=/ INSTALL_PREFIX=$(STAGING_DIR) install
+	$(MAKE1) -C $(LIBPQ_DIR)/src/interfaces/libpq OSARCH=Linux CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) $(TARGET_CONFIGURE_OPTS) \
+	INSTALL_BASE=/ INSTALL_PREFIX=$(STAGING_DIR) install
+	cp -a $(STAGING_DIR)/usr/local/pgsql/lib/libpq* $(TARGET_DIR)/lib
+	touch -c $(LIBPQ_DIR)/.installed
+
+libpq: uclibc $(LIBPQ_DIR)/.installed
+
+libpq-source: $(DL_DIR)/$(LIBPQ_SOURCE)
+
+libpq-clean:
+	rm -Rf $(STAGING_DIR)/lib/libpq*
+	-$(MAKE) -C $(LIBPQ_DIR) clean
+
+libpq-dirclean:
+	rm -rf $(LIBPQ_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_LIBPQ)),y)
+TARGETS+=libpq
+endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.