oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

newapkbuild: use 'plain' buildtype for meson and 'None' buildtype for CMake

Browse Source 
This way Meson and CMake will use the C{,PP,XX}FLAGS we've set in
`/etc/abuild.conf`. Without this change CMake and meson will overwrite
our CFLAGS with custom flags. Most importantly, they prefer -O1/-O2 over
our -Os.

See also: https://lists.alpinelinux.org/~alpine/devel/%3C2896c13070c508a49cbaa72c8fb7f34ea947358b.camel%40cogitri.dev%3E
This commit is contained in:
Rasmus Thomsen 2020-02-20 17:50:57 +01:00 committed by Sören Tempel
parent 6d741ffba8
commit 69fc8b8fc1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newapkbuild.in
View File

@ -65,7 +65,7 @@ build_cmake() {
-DCMAKE_INSTALL_PREFIX=/usr \\ -DCMAKE_INSTALL_PREFIX=/usr \\
-DCMAKE_INSTALL_LIBDIR=lib \\ -DCMAKE_INSTALL_LIBDIR=lib \\
-DBUILD_SHARED_LIBS=True \\ -DBUILD_SHARED_LIBS=True \\
-DCMAKE_BUILD_TYPE=Release \\ -DCMAKE_BUILD_TYPE=None \\
-DCMAKE_CXX_FLAGS="\$CXXFLAGS" \\ -DCMAKE_CXX_FLAGS="\$CXXFLAGS" \\
-DCMAKE_C_FLAGS="\$CFLAGS" \\ -DCMAKE_C_FLAGS="\$CFLAGS" \\
\${CMAKE_CROSSOPTS} . \${CMAKE_CROSSOPTS} .
@ -85,7 +85,7 @@ build_meson() {
--sysconfdir=/etc \\ --sysconfdir=/etc \\
--mandir=/usr/share/man \\ --mandir=/usr/share/man \\
--localstatedir=/var \\ --localstatedir=/var \\
--buildtype=release \\ --buildtype=plain \\
. output . output
ninja -C output ninja -C output
__EOF__ __EOF__