Author: arekm Date: Tue Mar 18 08:11:10 2008 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- try without custom -O? optimizations
---- Files affected:
SPECS:
openoffice.org.spec (1.775.2.67 -> 1.775.2.68)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.775.2.67
SPECS/openoffice.org.spec:1.775.2.68
--- SPECS/openoffice.org.spec:1.775.2.67 Mon Mar 17 20:02:35 2008
+++ SPECS/openoffice.org.spec Tue Mar 18 09:11:04 2008
@@ -2147,6 +2147,18 @@
exit 1
fi
+# Skip optimization. It overwrites some OOo own hacks with -O0
+SAFE_CFLAGS=""
+for i in %{rpmcflags}; do
+ case "$i" in
+ -O?)
+ ;;
+ *)
+ SAFE_CFLAGS="$SAFE_CFLAGS $i"
+ ;;
+ esac
+done
+
export CC="%{__cc}"
export CXX="%{__cxx}"
export CPP="%{__cpp}"
@@ -2335,9 +2347,9 @@
# don't use %%configure here. We don't want cflags/ldflags to be set that way
since
# it breaks things (like preventing NOOPTFILES from working)
./configure \
- CC="$CC" \
- CXX="$CXX" \
- CPP="$CPP" \
+ CC="$CC" \
+ CXX="$CXX" \
+ CPP="$CPP" \
--host=%{_target_platform} \
--build=%{_target_platform} \
--prefix=%{_prefix} \
@@ -2362,10 +2374,10 @@
# this limits processing some files but doesn't limit parallel build
# processes of main OOo build (since OOo uses it's own build system)
%{__make} -j1 \
- ARCH_FLAGS="%{rpmcflags} -fno-omit-frame-pointer -fno-strict-aliasing" \
- ARCH_FLAGS_CC="%{rpmcflags} -fno-omit-frame-pointer
-fno-strict-aliasing" \
- ARCH_FLAGS_CXX="%{rpmcxxflags} -fno-omit-frame-pointer
-fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden" \
- ARCH_FLAGS_OPT="%{rpmcflags}"
+ ARCH_FLAGS="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing" \
+ ARCH_FLAGS_CC="$SAFE_CFLAGS -fno-omit-frame-pointer
-fno-strict-aliasing" \
+ ARCH_FLAGS_CXX="$SAFE_CFLAGS -fno-omit-frame-pointer
-fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden" \
+ ARCH_FLAGS_OPT="$SAFE_CFLAGS"
# hack for parallel build
if [ $RPM_BUILD_NR_THREADS -gt 1 ]; then
@@ -4179,6 +4191,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.775.2.68 2008-03-18 08:11:04 arekm
+- try without custom -O? optimizations
+
Revision 1.775.2.67 2008-03-17 19:02:35 arekm
- builds
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.775.2.67&r2=1.775.2.68&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
