Changeset 1513
- Timestamp:
- 01/07/07 16:00:19 (2 years ago)
- Files:
-
- trunk/freewrt/package/asterisk/Makefile (modified) (3 diffs)
- trunk/freewrt/package/asterisk/patches/patch-Makefile (added)
- trunk/freewrt/package/asterisk/patches/patch-main_Makefile (modified) (2 diffs)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_close_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_conv_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_debug_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_delete_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_get_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_open_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_overflow_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_page_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_put_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_search_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_seq_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_split_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_btree_bt_utils_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_db_db_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_hash_hash_bigkey_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_hash_hash_buf_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_hash_hash_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_hash_hash_func_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_hash_hash_log2_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_hash_hash_page_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_hash_hsearch_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_include_ndbm_h (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_mpool_mpool_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_recno_rec_close_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_recno_rec_delete_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_recno_rec_get_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_recno_rec_open_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_recno_rec_put_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_recno_rec_search_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_recno_rec_seq_c (added)
- trunk/freewrt/package/asterisk/patches/patch-main_db1-ast_recno_rec_utils_c (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/freewrt/package/asterisk/Makefile
r1398 r1513 62 62 (cd $(WRKBUILD); rm -rf config.{cache,status} ; \ 63 63 $(TARGET_CONFIGURE_OPTS) \ 64 CFLAGS="$(strip $(TARGET_CFLAGS)) -I$(STAGING_DIR)/usr/include " \64 CFLAGS="$(strip $(TARGET_CFLAGS)) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ 65 65 CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ 66 LDFLAGS="-L$(STAGING_DIR)/usr/lib " \66 LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ 67 67 ./configure \ 68 68 --host=$(GNU_TARGET_NAME) \ … … 83 83 --sysconfdir=/etc \ 84 84 --disable-nls \ 85 --without-asound \ 86 --without-curl \ 87 --without-curses \ 88 --without-gnutls \ 89 --without-gsm \ 90 --without-iksemel \ 91 --without-imap \ 92 --without-isdnnet \ 93 --without-kde \ 94 --without-misdn \ 95 --without-nbs \ 96 --without-netsnmp \ 97 --without-newt \ 98 --without-odbc \ 99 --without-ogg \ 100 --without-osptk \ 101 --without-oss \ 102 --without-popt \ 103 --without-postgres \ 104 --without-pri \ 85 105 --without-pwlib \ 86 --without-h323 \ 106 --without-qt \ 107 --without-radius \ 108 --without-speex \ 109 --without-sqlite \ 110 --without-suppserv \ 87 111 --without-ssl \ 112 --without-tds \ 113 --without-termcap \ 114 --without-tinfo \ 115 --without-tonezone \ 116 --without-vorbis \ 117 --without-vpb \ 118 --without-zaptel \ 88 119 --with-z=$(STAGING_DIR)/usr \ 89 120 --with-ncurses=$(STAGING_DIR)/usr \ 90 121 ); 91 $(SED) 's,@@STAGING_DIR@@,$(STAGING_DIR),g' $(WRKBUILD)/main/Makefile 122 # $(SED) 's,@@STAGING_DIR@@,$(STAGING_DIR),g' $(WRKBUILD)/main/Makefile 123 # $(SED) 's,@@STAGING_DIR@@,$(STAGING_DIR),g' $(WRKBUILD)/Makefile 92 124 touch $@ 93 125 … … 98 130 ); 99 131 $(MAKE) -C "$(WRKBUILD)" \ 132 EXTRA_CFLAGS="$(strip $(TARGET_CFLAGS)) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ 133 EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ 100 134 DESTDIR="$(WRKINST)" \ 135 NOISY_BUILD=1 \ 101 136 all install samples 102 137 touch $@ trunk/freewrt/package/asterisk/patches/patch-main_Makefile
r1401 r1513 2 2 fixed CFLAGS and LDFLAGS for internal call to configure and make 3 3 --- asterisk-1.4.0.orig/main/Makefile 2006-12-18 12:59:24.000000000 +0100 4 +++ asterisk-1.4.0/main/Makefile 2007-01-0 4 15:45:04.000000000 +01004 +++ asterisk-1.4.0/main/Makefile 2007-01-05 12:22:38.000000000 +0100 5 5 @@ -94,8 +94,12 @@ ifeq ($(OSARCH),SunOS) 6 6 ASTLINK= 7 7 endif 8 8 9 +# dirty hax0ringfor cross compiling10 +ASTCFLAGS+= -I@@STAGING_DIR@@/usr/include11 +ASTLDFLAGS+= -L@@STAGING_DIR@@/usr/lib9 +# nice fix for cross compiling 10 +ASTCFLAGS+=$(EXTRA_CFLAGS) 11 +ASTLDFLAGS+=$(EXTRA_LDFLAGS) 12 12 + 13 13 editline/libedit.a: … … 17 17 18 18 db1-ast/libdb1.a: 19 @@ -135,7 +139,8 @@ asterisk: $(OBJS) editline/libedit.a db1 20 @rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp 21 @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c 22 $(ECHO_PREFIX) echo " [LD] $^ -> $@" 23 - $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) 24 + #$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) 25 + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) 26 @$(ASTTOPDIR)/build_tools/strip_nonapi $@ 27 28 clean::


