Skip to content

Commit 0ed729c

Browse files
committed
packages: use unified autoreconf_conf_args variable
1 parent 8e3e32c commit 0ed729c

32 files changed

Lines changed: 38 additions & 102 deletions

cmake/packages_check.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,10 @@ set(cmake_conf_args
7979
-DBUILD_TESTING=OFF
8080
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
8181
)
82+
83+
set(autoreconf_conf_args
84+
--host=${TARGET_ARCH}
85+
--prefix=${MINGW_INSTALL_PREFIX}
86+
--disable-shared
87+
--enable-static
88+
)

packages/curl.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ ExternalProject_Add(curl
77
PATCH_COMMAND ${EXEC} git am --3way ${CMAKE_CURRENT_SOURCE_DIR}/curl-*.patch
88
UPDATE_COMMAND ""
99
CONFIGURE_COMMAND ${EXEC} autoreconf -fi && CONF=1 <SOURCE_DIR>/configure
10-
--host=${TARGET_ARCH}
11-
--prefix=${MINGW_INSTALL_PREFIX}
12-
--disable-shared
10+
${autoreconf_conf_args}
1311
--with-mbedtls=${MINGW_INSTALL_PREFIX}
1412
BUILD_COMMAND ${MAKE}
1513
INSTALL_COMMAND ${MAKE} install

packages/flac.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ ExternalProject_Add(flac
55
GIT_CLONE_FLAGS "--filter=tree:0"
66
UPDATE_COMMAND ""
77
CONFIGURE_COMMAND ${EXEC} <SOURCE_DIR>/autogen.sh && CONF=1 <SOURCE_DIR>/configure
8-
--host=${TARGET_ARCH}
9-
--prefix=${MINGW_INSTALL_PREFIX}
10-
--enable-static
11-
--disable-shared
8+
${autoreconf_conf_args}
129
--disable-doxygen-docs
1310
--disable-xmms-plugin
1411
--disable-thorough-tests

packages/gmp.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@ ExternalProject_Add(gmp
33
URL_HASH SHA256=a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898
44
DOWNLOAD_DIR ${SOURCE_LOCATION}
55
CONFIGURE_COMMAND ${EXEC} CONF=1 <SOURCE_DIR>/configure
6+
${autoreconf_conf_args}
67
CC_FOR_BUILD=cc
7-
--host=${TARGET_ARCH}
8-
--prefix=${MINGW_INSTALL_PREFIX}
9-
--enable-static
10-
--disable-shared
118
BUILD_COMMAND ${MAKE}
129
INSTALL_COMMAND ${MAKE} install
1310
LOG_DOWNLOAD 1 LOG_UPDATE 1 LOG_CONFIGURE 1 LOG_BUILD 1 LOG_INSTALL 1

packages/lame.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ ExternalProject_Add(lame
1212
UPDATE_COMMAND ""
1313
PATCH_COMMAND chmod 755 ${DEBPATCH} && ${DEBPATCH}
1414
CONFIGURE_COMMAND ${EXEC} autoreconf -fi && CONF=1 <SOURCE_DIR>/configure
15-
--host=${TARGET_ARCH}
16-
--prefix=${MINGW_INSTALL_PREFIX}
17-
--disable-shared
15+
${autoreconf_conf_args}
1816
--disable-frontend
1917
BUILD_COMMAND ${MAKE}
2018
INSTALL_COMMAND ${MAKE} install

packages/libbluray.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ ExternalProject_Add(libbluray
88
GIT_SUBMODULES ""
99
UPDATE_COMMAND ""
1010
CONFIGURE_COMMAND ${EXEC} autoreconf -fi && CONF=1 <SOURCE_DIR>/configure
11-
--host=${TARGET_ARCH}
12-
--prefix=${MINGW_INSTALL_PREFIX}
13-
--disable-shared
11+
${autoreconf_conf_args}
1412
--disable-examples
1513
--disable-doxygen-doc
1614
--disable-bdjava-jar

packages/libbs2b.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ ExternalProject_Add(libbs2b
55
PATCH_COMMAND ${EXEC} git am --3way ${CMAKE_CURRENT_SOURCE_DIR}/libbs2b-*.patch
66
UPDATE_COMMAND ""
77
CONFIGURE_COMMAND ${EXEC} <SOURCE_DIR>/autogen.sh && CONF=1 <SOURCE_DIR>/configure
8-
--host=${TARGET_ARCH}
9-
--prefix=${MINGW_INSTALL_PREFIX}
10-
--enable-static
11-
--disable-shared
8+
${autoreconf_conf_args}
129
BUILD_COMMAND ${MAKE}
1310
INSTALL_COMMAND ${MAKE} install
1411
BUILD_IN_SOURCE 1

packages/libdvdcss.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ ExternalProject_Add(libdvdcss
44
GIT_CLONE_FLAGS "--filter=tree:0"
55
UPDATE_COMMAND ""
66
CONFIGURE_COMMAND ${EXEC} autoreconf -fi && CONF=1 <SOURCE_DIR>/configure
7-
--host=${TARGET_ARCH}
8-
--prefix=${MINGW_INSTALL_PREFIX}
9-
--disable-shared
7+
${autoreconf_conf_args}
108
--disable-doc
119
BUILD_COMMAND ${MAKE}
1210
INSTALL_COMMAND ${MAKE} install

packages/libdvdnav.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ ExternalProject_Add(libdvdnav
55
GIT_CLONE_FLAGS "--filter=tree:0"
66
UPDATE_COMMAND ""
77
CONFIGURE_COMMAND ${EXEC} autoreconf -fi && CONF=1 <SOURCE_DIR>/configure
8-
--host=${TARGET_ARCH}
9-
--prefix=${MINGW_INSTALL_PREFIX}
10-
--disable-shared
8+
${autoreconf_conf_args}
119
BUILD_COMMAND ${MAKE}
1210
INSTALL_COMMAND ${MAKE} install
1311
BUILD_IN_SOURCE 1

packages/libdvdread.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ ExternalProject_Add(libdvdread
55
GIT_CLONE_FLAGS "--filter=tree:0"
66
UPDATE_COMMAND ""
77
CONFIGURE_COMMAND ${EXEC} autoreconf -fi && CONF=1 <SOURCE_DIR>/configure
8-
--host=${TARGET_ARCH}
9-
--prefix=${MINGW_INSTALL_PREFIX}
10-
--disable-shared
8+
${autoreconf_conf_args}
119
--with-libdvdcss
1210
BUILD_COMMAND ${MAKE}
1311
INSTALL_COMMAND ${MAKE} install

0 commit comments

Comments
 (0)