packages: martian/martian.spec - build userspace modules first - note about...

glen glen at pld-linux.org
Sat Aug 13 13:00:02 CEST 2011


Author: glen                         Date: Sat Aug 13 11:00:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build userspace modules first
- note about stripping symbols and other from modem binary

---- Files affected:
packages/martian:
   martian.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/martian/martian.spec
diff -u packages/martian/martian.spec:1.1 packages/martian/martian.spec:1.2
--- packages/martian/martian.spec:1.1	Sat Aug 13 12:23:42 2011
+++ packages/martian/martian.spec	Sat Aug 13 12:59:57 2011
@@ -1,4 +1,7 @@
 # $Revision$, $Date$
+# TODO
+# - -Wl,-q broken for gcc 4.6 (gcc 4.5 is ok)
+# - disable stripping martian_modem as it needs to resolve it's symbols at runtime
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
@@ -17,7 +20,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	0.1
+%define		rel	0.5
 %define		pname	martian
 Summary:	martian / linmodem package
 Name:		%{pname}%{_alt_kernel}
@@ -70,19 +73,17 @@
 %{__sed} -i -e 's#gcc -#$(CC) -#g' modem/Makefile
 
 %build
-%if %{with kernel}
-%build_kernel_modules -m %{pname}_dev -C kmodule
-%endif
-
 %if %{with userspace}
 %{__make} -C modem martian_modem \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} -Wall" \
-	MLDFLAGS="%{rpmldflags} -lpthread -lrt" \
+	MLDFLAGS="%{rpmldflags} -Wl,-q -lpthread -lrt" \
 	SHELL=/bin/bash
-
 %endif
 
+%if %{with kernel}
+%build_kernel_modules -m %{pname}_dev -C kmodule
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -129,6 +130,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/08/13 10:59:57  glen
+- build userspace modules first
+- note about stripping symbols and other from modem binary
+
 Revision 1.1  2011/08/13 10:23:42  glen
 - new, based on http://linmodems.technion.ac.il/packages/ltmodem/kernel-2.6/martian/martian-20061203.spec
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/martian/martian.spec?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list