diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-09-02 23:21:01 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-09-02 23:21:01 +0200 |
| commit | 4e66b3b83a173ca5ac7c2e1f9b7ce1bef816a53a (patch) | |
| tree | 05051cd71910334e471c40f6d54c48b48c137148 | |
| parent | 657041c692742710cdc266301f5f9c8625637867 (diff) | |
| download | tde-packaging-4e66b3b83a173ca5ac7c2e1f9b7ce1bef816a53a.tar.gz tde-packaging-4e66b3b83a173ca5ac7c2e1f9b7ce1bef816a53a.zip | |
RPM Packaging: update build scripts
| -rw-r--r-- | redhat/macros.cmake | 34 | ||||
| -rw-r--r-- | redhat/packages.mga | 1 | ||||
| -rw-r--r-- | redhat/packages.oss | 1 |
3 files changed, 36 insertions, 0 deletions
diff --git a/redhat/macros.cmake b/redhat/macros.cmake new file mode 100644 index 000000000..cdcb7a1e1 --- /dev/null +++ b/redhat/macros.cmake @@ -0,0 +1,34 @@ +# +# Macros for cmake +# +%_cmake_lib_suffix64 -DLIB_SUFFIX=64 +%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON +%_cmake_version 2.8.11 +%__cmake /usr/bin/cmake + +# - Set default compile flags +# - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables +# and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS +# - Turn on verbose makefiles so we can see and verify compile flags +# - Set default install prefixes and library install directories +# - Turn on shared libraries by default +%cmake \ + CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ + FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ + FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \ + %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ + %__cmake \\\ + -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ + -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ +%if "%{?_lib}" == "lib64" \ + %{?_cmake_lib_suffix64} \\\ +%endif \ + -DBUILD_SHARED_LIBS:BOOL=ON diff --git a/redhat/packages.mga b/redhat/packages.mga index d4dff78bb..5c1d2d8b3 100644 --- a/redhat/packages.mga +++ b/redhat/packages.mga @@ -321,3 +321,4 @@ lib64clucene-devel sword-devel drakconf imlib1-devel +NetworkManager-glib-devel diff --git a/redhat/packages.oss b/redhat/packages.oss index d44382f16..214699683 100644 --- a/redhat/packages.oss +++ b/redhat/packages.oss @@ -164,3 +164,4 @@ postgresql xscreensaver-data-extra ffmpeg1-devel recode +NetworkManager-devel |