Skip to content

Commit df7dae7

Browse files
mariotakumariotaku
committed
updating build script
1 parent 09d005d commit df7dae7

File tree

20 files changed

+84
-108
lines changed

20 files changed

+84
-108
lines changed

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
jobs:
1515
macos-x86_64:
1616
name: macOS x86_64
17-
runs-on: macos-12-xl
17+
runs-on: macos-12
1818

1919
steps:
2020
- uses: actions/checkout@v3

‎CMakeLists.txt

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,22 @@ set(GNU_TARGET_NAME "arm-webos-linux-gnueabi")
1717
set(BUILDROOT_RELEASE "webos-71307ba")
1818
set(BUILDROOT_SDK_NAME "${GNU_TARGET_NAME}_sdk-buildroot")
1919

20-
set(HOST_DIR "${CMAKE_BINARY_DIR}/${BUILDROOT_SDK_NAME}")
21-
set(BUILDROOT_PORT_DOWNLOADS "${CMAKE_BINARY_DIR}/downloads")
20+
if (NOT DEFINED GNU_MIRROR)
21+
set(GNU_MIRROR "https://ftp.gnu.org/gnu")
22+
endif ()
2223

23-
set(GCC_MIRROR "https://gcc.gnu.org/pub/gcc")
24+
if (NOT DEFINED GCC_MIRROR)
25+
set(GCC_MIRROR "https://gcc.gnu.org/pub/gcc")
26+
endif ()
2427

25-
set(CMAKE_INSTALL_PREFIX ${HOST_DIR})
28+
if (NOT DEFINED BUILDROOT_DOWNLOADS)
29+
set(BUILDROOT_DOWNLOADS "https://github.com/openlgtv/buildroot-nc4/releases/download")
30+
endif ()
31+
32+
if (NOT DEFINED CMAKE_INSTALL_PREFIX)
33+
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/dist")
34+
endif ()
35+
set(CMAKE_STAGING_PREFIX "${CMAKE_BINARY_DIR}/${BUILDROOT_SDK_NAME}")
2636

2737
if (NOT DEFINED CMAKE_C_COMPILER_TARGET)
2838
execute_process(COMMAND "${CMAKE_C_COMPILER}" "-v" ERROR_VARIABLE GCC_VERSION_INFO)
@@ -41,4 +51,7 @@ FetchContent_MakeAvailable(buildroot-nc4)
4151

4252
add_subdirectory(sysroot)
4353
add_subdirectory(package)
54+
55+
install(DIRECTORY ${CMAKE_STAGING_PREFIX}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS)
56+
4457
add_subdirectory(toolchain)

‎package/autoconf-archive/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ ExternalProject_Get_Property(autoconf INSTALL_DIR)
44
set(AUTOCONF_INSTALL_DIR ${INSTALL_DIR})
55

66
ExternalProject_Add(autoconf-archive DEPENDS autoconf m4
7-
URL "https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-${AUTOCONF_ARCHIVE_VERSION}.tar.xz"
7+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
8+
URL "${GNU_MIRROR}/autoconf-archive/autoconf-archive-${AUTOCONF_ARCHIVE_VERSION}.tar.xz"
89
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
910
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc
1011
AUTOCONF=${AUTOCONF_INSTALL_DIR}/bin/autoconf AUTOHEADER=${AUTOCONF_INSTALL_DIR}/bin/autoheader
1112
BUILD_COMMAND $(MAKE)
1213
INSTALL_COMMAND $(MAKE) install-strip)
1314

14-
ExternalProject_Get_Property(autoconf-archive INSTALL_DIR)
15-
16-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
17-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)
15+
ExternalProject_Get_Property(autoconf-archive INSTALL_DIR)

‎package/autoconf/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@ ExternalProject_Get_Property(m4 INSTALL_DIR)
77
set(M4_INSTALL_DIR ${INSTALL_DIR})
88

99
ExternalProject_Add(autoconf DEPENDS m4
10-
URL "https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.xz"
10+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
11+
URL "${GNU_MIRROR}/autoconf/autoconf-${AUTOCONF_VERSION}.tar.xz"
1112
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
1213
PATCH_COMMAND ${AUTOCONF_PATCH_COMMANDS}
1314
CONFIGURE_COMMAND EMACS="no" ac_cv_path_M4=${M4_INSTALL_DIR}/bin/m4 ac_cv_prog_gnu_m4_gnu=no
1415
<SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc
1516
BUILD_COMMAND $(MAKE)
1617
INSTALL_COMMAND $(MAKE) install-strip)
1718

18-
ExternalProject_Get_Property(autoconf INSTALL_DIR)
19-
20-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
21-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)
19+
ExternalProject_Get_Property(autoconf INSTALL_DIR)

‎package/automake/CMakeLists.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@ ExternalProject_Get_Property(autoconf INSTALL_DIR)
77
set(AUTOCONF_INSTALL_DIR ${INSTALL_DIR})
88

99
ExternalProject_Add(automake DEPENDS autoconf autoconf-archive
10-
URL "https://ftp.gnu.org/gnu/automake/automake-${AUTOMAKE_VERSION}.tar.xz"
10+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
11+
URL "${GNU_MIRROR}/automake/automake-${AUTOMAKE_VERSION}.tar.xz"
1112
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
1213
PATCH_COMMAND ${AUTOMAKE_PATCH_COMMANDS}
1314
CONFIGURE_COMMAND
14-
COMMAND ${CMAKE_COMMAND} -E make_directory ${HOST_DIR}/share/aclocal
15+
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_STAGING_PREFIX}/share/aclocal
1516
COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc
1617
AUTOCONF=${AUTOCONF_INSTALL_DIR}/bin/autoconf AUTOHEADER=${AUTOCONF_INSTALL_DIR}/bin/autoheader
1718
BUILD_COMMAND $(MAKE)
1819
INSTALL_COMMAND $(MAKE) install-strip)
1920

20-
ExternalProject_Get_Property(automake INSTALL_DIR)
21-
22-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
23-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)
21+
ExternalProject_Get_Property(automake INSTALL_DIR)

‎package/binutils/CMakeLists.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
set(BINUTILS_VERSION 2.38)
22

3-
set(SYSROOT "${HOST_DIR}/${GNU_TARGET_NAME}/sysroot")
3+
set(SYSROOT "${CMAKE_STAGING_PREFIX}/${GNU_TARGET_NAME}/sysroot")
44

55
ExternalProject_Add(binutils DEPENDS sysroot
6-
URL "https://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VERSION}.tar.bz2"
6+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
7+
URL "${GNU_MIRROR}/binutils/binutils-${BINUTILS_VERSION}.tar.bz2"
78
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
89
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc --disable-multilib
910
--disable-werror --target=${GNU_TARGET_NAME} --disable-shared --enable-static --with-sysroot=${SYSROOT}
@@ -12,7 +13,4 @@ ExternalProject_Add(binutils DEPENDS sysroot
1213
BUILD_COMMAND $(MAKE) MAKEINFO=true
1314
INSTALL_COMMAND $(MAKE) install-strip MAKEINFO=true)
1415

15-
ExternalProject_Get_Property(binutils INSTALL_DIR)
16-
17-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
18-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)
16+
ExternalProject_Get_Property(binutils INSTALL_DIR)

‎package/gawk/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ ExternalProject_Get_Property(mpfr INSTALL_DIR)
77
set(MPFR_INSTALL_DIR ${INSTALL_DIR})
88

99
ExternalProject_Add(gawk DEPENDS mpfr
10-
URL "https://ftp.gnu.org/gnu/gawk/gawk-${GAWK_VERSION}.tar.xz"
10+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
11+
URL "${GNU_MIRROR}/gawk/gawk-${GAWK_VERSION}.tar.xz"
1112
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
1213
PATCH_COMMAND ${GAWK_PATCH_COMMANDS}
1314
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc
14-
--with-mpfr=${MPFR_INSTALL_DIR}
1515
BUILD_COMMAND $(MAKE)
1616
INSTALL_COMMAND $(MAKE) install-strip)
1717

1818
ExternalProject_Get_Property(gawk INSTALL_DIR)
1919

20-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
21-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)
2220
install(CODE "file(CREATE_LINK gawk ${CMAKE_INSTALL_PREFIX}/bin/awk SYMBOLIC)")

‎package/gcc/CMakeLists.txt

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set(GCC_VERSION 12.2.0)
22

3-
set(SYSROOT "${HOST_DIR}/${GNU_TARGET_NAME}/sysroot")
3+
set(SYSROOT "${CMAKE_STAGING_PREFIX}/${GNU_TARGET_NAME}/sysroot")
44

55
file(GLOB GCC_PATCHES "${buildroot-nc4_SOURCE_DIR}/package/gcc/12.2.0/*.patch")
66
list(TRANSFORM GCC_PATCHES PREPEND "COMMAND;patch;-p1;<;" OUTPUT_VARIABLE GCC_PATCH_COMMANDS)
@@ -21,25 +21,19 @@ ExternalProject_Get_Property(binutils INSTALL_DIR)
2121
set(BINUTILS_INSTALL_DIR ${INSTALL_DIR})
2222

2323
ExternalProject_Add(gcc DEPENDS sysroot binutils gmp mpc mpfr isl m4
24+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
2425
URL "${GCC_MIRROR}/releases/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz"
2526
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
2627
PATCH_COMMAND ${GCC_PATCH_COMMANDS}
2728
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc --enable-static
28-
--build=${CMAKE_C_COMPILER_TARGET} --target=${GNU_TARGET_NAME} --with-sysroot=${SYSROOT} --enable-__cxa_atexit
29-
--with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto
30-
--with-gmp=${GMP_INSTALL_DIR} --with-mpc=${MPC_INSTALL_DIR} --with-mpfr=${MPFR_INSTALL_DIR}
31-
"--with-pkgversion=Buildroot -g${BUILDROOT_BUILD_ID}" "--with-bugurl=http://bugs.buildroot.net"
32-
--without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads
33-
--with-isl=${ISL_INSTALL_DIR} --with-abi=aapcs-linux --with-cpu=cortex-a9 --with-fpu=neon-fp16
34-
--with-float=softfp --with-mode=arm --enable-languages=c,c++
35-
--with-build-time-tools=${BINUTILS_INSTALL_DIR}/${GNU_TARGET_NAME}/bin --enable-shared --disable-libgomp
29+
--build=${CMAKE_C_COMPILER_TARGET} --target=${GNU_TARGET_NAME} --with-sysroot=${SYSROOT} --enable-__cxa_atexit
30+
--with-gnu-ld --disable-libssp --disable-multilib --disable-decimal-float --enable-plugins --enable-lto
31+
--with-gmp=<INSTALL_DIR> --with-mpc=<INSTALL_DIR> --with-mpfr=<INSTALL_DIR> --with-isl=<INSTALL_DIR>
32+
"--with-pkgversion=Buildroot -g${BUILDROOT_BUILD_ID}" "--with-bugurl=http://bugs.buildroot.net"
33+
--without-zstd --disable-libquadmath --disable-libquadmath-support --enable-tls --enable-threads
34+
--with-abi=aapcs-linux --with-cpu=cortex-a9 --with-fpu=neon-fp16
35+
--with-float=softfp --with-mode=arm --enable-languages=c,c++
36+
--with-build-time-tools=${BINUTILS_INSTALL_DIR}/${GNU_TARGET_NAME}/bin --enable-shared --disable-libgomp
3637
BUILD_COMMAND $(MAKE) MAKEINFO=true
3738
INSTALL_COMMAND $(MAKE) install-strip MAKEINFO=true
38-
)
39-
40-
ExternalProject_Get_Property(gcc INSTALL_DIR)
41-
42-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
43-
PATTERN bin EXCLUDE PATTERN src EXCLUDE PATTERN tmp EXCLUDE)
44-
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -DSOURCE=${INSTALL_DIR}/bin -DDESTINATION=${HOST_DIR}/bin
45-
-DGNU_TARGET_NAME=${GNU_TARGET_NAME} -P ${CMAKE_CURRENT_SOURCE_DIR}/install_bin.cmake)")
39+
)

‎package/gcc/install_bin.cmake

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎package/gmp/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ExternalProject_Get_Property(m4 INSTALL_DIR)
44
set(M4_INSTALL_DIR ${INSTALL_DIR})
55

66
ExternalProject_Add(gmp DEPENDS m4
7+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
78
URL "${GCC_MIRROR}/infrastructure/gmp-${GMP_VERSION}.tar.bz2"
89
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
910
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc
@@ -12,6 +13,3 @@ ExternalProject_Add(gmp DEPENDS m4
1213
INSTALL_COMMAND $(MAKE) install-strip)
1314

1415
ExternalProject_Get_Property(gmp INSTALL_DIR)
15-
16-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
17-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)

‎package/gperf/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
br_get_var("package/gperf/gperf.mk" GPERF_VERSION GPERF_VERSION)
22

33
ExternalProject_Add(gperf
4-
URL "https://ftp.gnu.org/gnu/gperf/gperf-${GPERF_VERSION}.tar.gz"
4+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
5+
URL "${GNU_MIRROR}/gperf/gperf-${GPERF_VERSION}.tar.gz"
56
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
67
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc
78
BUILD_COMMAND $(MAKE)
89
INSTALL_COMMAND $(MAKE) install)
910

1011
ExternalProject_Get_Property(gperf INSTALL_DIR)
11-
12-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
13-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)

‎package/isl/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ ExternalProject_Get_Property(gmp INSTALL_DIR)
44
set(GMP_INSTALL_DIR ${INSTALL_DIR})
55

66
ExternalProject_Add(isl DEPENDS gmp
7+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
78
URL "${GCC_MIRROR}/infrastructure/isl-${ISL_VERSION}.tar.bz2"
89
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
910
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc
10-
--with-gmp-prefix=${GMP_INSTALL_DIR}
11+
--with-gmp-prefix=<INSTALL_DIR>
1112
BUILD_COMMAND $(MAKE)
1213
INSTALL_COMMAND $(MAKE) install-strip)
1314

1415
ExternalProject_Get_Property(isl INSTALL_DIR)
15-
16-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
17-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)

‎package/libtool/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ ExternalProject_Get_Property(m4 INSTALL_DIR)
44
set(M4_INSTALL_DIR ${INSTALL_DIR})
55

66
ExternalProject_Add(libtool DEPENDS autoconf m4
7-
URL "https://ftp.gnu.org/gnu/libtool/libtool-${LIBTOOL_VERSION}.tar.xz"
7+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
8+
URL "${GNU_MIRROR}/libtool/libtool-${LIBTOOL_VERSION}.tar.xz"
89
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
910
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc
1011
M4=${M4_INSTALL_DIR}/bin/m4 MAKEINFO=true
1112
BUILD_COMMAND $(MAKE)
12-
INSTALL_COMMAND $(MAKE) install)
13+
INSTALL_COMMAND $(MAKE) install-strip)
1314

1415
ExternalProject_Get_Property(libtool INSTALL_DIR)
15-
16-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
17-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)

‎package/m4/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ ExternalProject_Get_Property(gperf INSTALL_DIR)
44
set(GPERF_INSTALL_DIR ${INSTALL_DIR})
55

66
ExternalProject_Add(m4 DEPENDS gperf
7-
URL "https://ftp.gnu.org/gnu/m4/m4-${M4_VERSION}.tar.xz"
7+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
8+
URL "${GNU_MIRROR}/m4/m4-${M4_VERSION}.tar.xz"
89
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
910
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc --disable-nls
1011
BUILD_COMMAND $(MAKE) GPERF=${GPERF_INSTALL_DIR}/bin/gperf HELP2MAN=true
1112
INSTALL_COMMAND $(MAKE) install-strip HELP2MAN=true)
1213

13-
ExternalProject_Get_Property(m4 INSTALL_DIR)
14-
15-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
16-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)
14+
ExternalProject_Get_Property(m4 INSTALL_DIR)

‎package/mpc/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ ExternalProject_Get_Property(mpfr INSTALL_DIR)
77
set(MPFR_INSTALL_DIR ${INSTALL_DIR})
88

99
ExternalProject_Add(mpc DEPENDS gmp mpfr
10+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
1011
URL "${GCC_MIRROR}/infrastructure/mpc-${MPC_VERSION}.tar.gz"
1112
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
1213
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc
13-
--with-gmp=${GMP_INSTALL_DIR} --with-mpfr=${MPFR_INSTALL_DIR}
14+
--with-gmp=<INSTALL_DIR> --with-mpfr=<INSTALL_DIR>
1415
BUILD_COMMAND $(MAKE)
1516
INSTALL_COMMAND $(MAKE) install-strip)
1617

17-
ExternalProject_Get_Property(mpc INSTALL_DIR)
18-
19-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
20-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)
18+
ExternalProject_Get_Property(mpc INSTALL_DIR)

‎package/mpfr/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ ExternalProject_Get_Property(gmp INSTALL_DIR)
44
set(GMP_INSTALL_DIR ${INSTALL_DIR})
55

66
ExternalProject_Add(mpfr DEPENDS gmp
7+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
78
URL "${GCC_MIRROR}/infrastructure/mpfr-${MPFR_VERSION}.tar.bz2"
89
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
910
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc
10-
--with-gmp=${GMP_INSTALL_DIR}
11+
--with-gmp=<INSTALL_DIR>
1112
BUILD_COMMAND $(MAKE)
1213
INSTALL_COMMAND $(MAKE) install-strip)
1314

14-
ExternalProject_Get_Property(mpfr INSTALL_DIR)
15-
16-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
17-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)
15+
ExternalProject_Get_Property(mpfr INSTALL_DIR)

‎package/pkgconf/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
br_get_var("package/pkgconf/pkgconf.mk" PKGCONF_VERSION PKGCONF_VERSION)
22

3-
set(SYSROOT "${HOST_DIR}/${GNU_TARGET_NAME}/sysroot")
3+
set(SYSROOT "${CMAKE_STAGING_PREFIX}/${GNU_TARGET_NAME}/sysroot")
44

55
file(GLOB PKGCONF_PATCHES "${buildroot-nc4_SOURCE_DIR}/package/pkgconf/*.patch")
66
list(TRANSFORM PKGCONF_PATCHES PREPEND "COMMAND;patch;-p1;<;" OUTPUT_VARIABLE PKGCONF_PATCH_COMMANDS)
77

88
ExternalProject_Add(pkgconf DEPENDS autoconf automake sysroot
9+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
910
URL "https://distfiles.dereferenced.org/pkgconf/pkgconf-${PKGCONF_VERSION}.tar.xz"
1011
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
1112
PATCH_COMMAND ${PKGCONF_PATCH_COMMANDS}
@@ -16,9 +17,6 @@ ExternalProject_Add(pkgconf DEPENDS autoconf automake sysroot
1617

1718
ExternalProject_Get_Property(pkgconf INSTALL_DIR)
1819

19-
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS
20-
PATTERN src EXCLUDE PATTERN tmp EXCLUDE)
21-
2220
set(STAGING_SUBDIR "${GNU_TARGET_NAME}/sysroot")
2321
set(STATIC "")
2422

‎sysroot/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
set(PREFIX ${HOST_DIR})
2-
set(SYSROOT "${PREFIX}/${GNU_TARGET_NAME}/sysroot")
1+
set(SYSROOT "${CMAKE_STAGING_PREFIX}/${GNU_TARGET_NAME}/sysroot")
32

43
if (APPLE OR BSD)
5-
set(PATCH_RELOCATE_SDK "COMMAND" "patch" "${HOST_DIR}/relocate-sdk.sh"
4+
set(PATCH_RELOCATE_SDK "COMMAND" "patch" "${CMAKE_STAGING_PREFIX}/relocate-sdk.sh"
65
"${CMAKE_CURRENT_SOURCE_DIR}/relocate-sdk.patch")
76
endif ()
87

98
ExternalProject_Add(sysroot
10-
URL "https://github.com/openlgtv/buildroot-nc4/releases/download/${BUILDROOT_RELEASE}/${BUILDROOT_SDK_NAME}.tar.gz"
9+
INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
10+
URL "${BUILDROOT_DOWNLOADS}/${BUILDROOT_RELEASE}/${BUILDROOT_SDK_NAME}.tar.gz"
1111
DOWNLOAD_NO_EXTRACT TRUE
1212
CONFIGURE_COMMAND ""
1313
BUILD_COMMAND ""
@@ -17,4 +17,5 @@ ExternalProject_Add(sysroot
1717
"${BUILDROOT_SDK_NAME}/environment-setup"
1818
"${BUILDROOT_SDK_NAME}/relocate-sdk.sh" || true
1919
${PATCH_RELOCATE_SDK}
20-
COMMAND "${HOST_DIR}/relocate-sdk.sh")
20+
COMMAND "${CMAKE_STAGING_PREFIX}/relocate-sdk.sh"
21+
${PATCH_ENVIRONMENT_SETUP})

0 commit comments

Comments
 (0)