Revision: 6743
http://ipcop.svn.sourceforge.net/ipcop/?rev=6743&view=rev
Author: gespinasse
Date: 2012-08-05 06:28:31 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
Drop SLANG_OPTIMIZE_FOR_SPEED 0 setting as that create tests error.
This does not change the resulting installer size
LANG=C ls -l build_i486/installer/initramfs/bin/installer
-rwxr-xr-x 1 root root 266696 Aug 5 08:42
build_i486/installer/initramfs/bin/installer
I had this in my tree since a long time
Modified Paths:
--------------
ipcop/trunk/lfs/slang
Modified: ipcop/trunk/lfs/slang
===================================================================
--- ipcop/trunk/lfs/slang 2012-08-05 06:09:48 UTC (rev 6742)
+++ ipcop/trunk/lfs/slang 2012-08-05 06:28:31 UTC (rev 6743)
@@ -83,27 +83,29 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- # disabled options are not important. It's for modules and slsh that we
don't care
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && sed -i 's/^#define
SLANG_OPTIMIZE_FOR_SPEED.*$$/#define SLANG_OPTIMIZE_FOR_SPEED 0/' \
-
src/sl-feat.h
- cd $(DIR_APP) && sed -i 's/^#define
SLANG_HAS_DEBUGGER_SUPPORT.*$$/#define SLANG_HAS_DEBUGGER_SUPPORT 0/' \
-
src/sl-feat.h
- # make sometimes break when using PARALLELISM, don't use it
- # Static lib is compiled in all cases
- # - when linking directly to that static lib
- # - or when using shared lib to allow mklibs to reduce the shared lib
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ # Disabling SLANG_OPTIMIZE_FOR_SPEED drive to test compilation errors
and doesn't change the installer size : dropped
+ #cd $(DIR_APP) && sed -i 's/^#define
SLANG_OPTIMIZE_FOR_SPEED.*$$/#define SLANG_OPTIMIZE_FOR_SPEED 0/' src/sl-feat.h
+ cd $(DIR_APP) && sed -i 's/^#define
SLANG_HAS_DEBUGGER_SUPPORT.*$$/#define SLANG_HAS_DEBUGGER_SUPPORT 0/'
src/sl-feat.h
+ # Static lib is used
+ # - when linking our installer directly to the static lib
+ # - or when linking our installer to slang shared lib to allow mklibs
to reduce the shared lib
+
# Installer will link to shared lib if both static and shared lib are
installed
- # Actually shared lib (even reduced by mklibs) produce an overall
bigger code for the installer
- cd $(DIR_APP)/src && make
- cd $(DIR_APP) && install -m 0644 src/objs/libslang.a /usr/lib
- mkdir -p /usr/include/slang
- cd $(DIR_APP) && install -m 0644 src/slang.h src/slcurses.h
/usr/include/slang
+ # Actually shared lib (even reduced by mklibs) + installer produce an
overall bigger code than statically linked to installer
- # If we want to use as shared lib, uncomment that
- #cd $(DIR_APP) && make elf
- #cd $(DIR_APP) && make install-elf
- # With shared lib, uncomment to reduce with mklibs
+ # make sometimes break when using PARALLELISM, don't use it
+ # Avoid compiling slsh as that fail with SLANG_OPTIMIZE_FOR_SPEED 0,
compile only the static lib
+ cd $(DIR_APP)/src && make static
+
+
+ifeq "$(RUNNING_TEST)" "yes"
+ cd $(DIR_APP) && make check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+endif
+
+ cd $(DIR_APP)/src && make install-static
+
+ # In case we want to test linking installer against the shared lib,
uncomment that
#cd /usr/lib && ln -sf libslang.a libslang_pic.a
#cd $(DIR_APP) && install -m 0644 src/slang.ver
/usr/lib/libslang_pic.map
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
