[hipl-commit] [packaging] Rev 3590: moved CFLAG required for Maemo from packaging to configure + added more

  • From: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Tue, 16 Feb 2010 17:40:40 +0200

Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
Date: Tue Feb 16 16:39:08 2010 +0100
Revision: 3590
Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: packaging

Log:
  moved CFLAG required for Maemo from packaging to configure + added more
  
  HIPL for Maemo is now built with optimizations and debug symbols

Modified:
  M  configure.ac
  M  debian/rules

=== modified file 'configure.ac'
--- configure.ac        2010-02-11 11:34:54 +0000
+++ configure.ac        2010-02-16 15:39:08 +0000
@@ -123,7 +123,7 @@
 if test x"$ac_cv_use_agent" = x"yes"; then
        AC_DEFINE(CONFIG_HIP_AGENT)
     AH_TEMPLATE(CONFIG_HIP_AGENT, [Defined to 1 if agent is enabled.])
-        AC_CHECK_LIB(sqlite3, sqlite3_open,, AC_MSG_ERROR(libsqlite3-dev not 
found))   
+        AC_CHECK_LIB(sqlite3, sqlite3_open,, AC_MSG_ERROR(libsqlite3-dev not 
found))
 fi
 AM_CONDITIONAL(HIP_AGENT, test x"$ac_cv_use_agent" = x"yes")
 
@@ -208,6 +208,7 @@
                [ac_cv_use_maemo], [ac_cv_use_maemo=no])
 if test x"$ac_cv_use_maemo" = x"yes"; then
         AC_DEFINE(CONFIG_HIP_MAEMO)
+        AC_SUBST(MAEMO_CFLAGS, "-O2 -g -fgnu89-inline")
         AC_SUBST(MAEMO_CPPFLAGS, "-I/usr/include/libipq/")
         AH_TEMPLATE(CONFIG_HIP_MAEMO, [Defined to 1 if maemo build is 
enabled.])
 fi
@@ -427,7 +428,7 @@
 
 # Set default AM_CFLAGS for the complete project.
 # -funit-at-a-time can be removed when libinet6 is removed.
-AC_SUBST(AM_CFLAGS, "-std=c99 -Werror -Wall -Wredundant-decls 
-Wdisabled-optimization -Wundef -Wstrict-prototypes 
-Wno-deprecated-declarations -fno-strict-aliasing -funit-at-a-time 
$OPENWRT_CFLAGS $GPROF_CFLAGS")
+AC_SUBST(AM_CFLAGS, "-std=c99 -Werror -Wall -Wredundant-decls 
-Wdisabled-optimization -Wundef -Wstrict-prototypes 
-Wno-deprecated-declarations -fno-strict-aliasing -funit-at-a-time 
$OPENWRT_CFLAGS $MAEMO_CFLAGS $GPROF_CFLAGS")
 
 # Set the preprocessor flags for the entire project
 AC_SUBST(AM_CPPFLAGS, "-D_POSIX_C_SOURCE=200112L -D_XOPEN_SOURCE=500 
$MAEMO_CPPFLAGS")

=== modified file 'debian/rules'
--- debian/rules        2010-02-12 16:47:00 +0000
+++ debian/rules        2010-02-16 15:39:08 +0000
@@ -31,7 +31,7 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
        cp -f /usr/share/misc/config.guess config.guess
 endif
-       ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS) -fgnu89-inline" 
--enable-maemo --disable-firewall --disable-privsep --enable-midauth
+       ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man 
--infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" --enable-maemo 
--disable-firewall --disable-privsep --enable-midauth
 
 
 build: build-stamp

Other related posts:

  • » [hipl-commit] [packaging] Rev 3590: moved CFLAG required for Maemo from packaging to configure + added more - Rene Hummen