Message ID | 20190417175405.2659-1-patrick.mcdermott@libiquity.com |
---|---|
State | Changes Requested |
Delegated to: | Petr Štetiar |
Headers | show |
Series | [OpenWrt-Devel,opkg-lede] build: Allow overriding opkg state dir prefix | expand |
Patrick McDermott <patrick.mcdermott@libiquity.com> [2019-04-17 13:54:05]: You've probably forget to add commit description, which would explain us why you need this changes or what problem it fixes as requested in https://openwrt.org/submitting-patches > Signed-off-by: Patrick McDermott <patrick.mcdermott@libiquity.com> > --- > CMakeLists.txt | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 26230b3..f57fe10 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -7,6 +7,7 @@ INCLUDE(TestBigEndian) > SET(HOST_CPU "" CACHE STRING "Override Host CPU") > SET(BUILD_CPU "" CACHE STRING "Override Host CPU") > SET(LOCK_FILE "/var/lock/opkg.lock" CACHE STRING "Override lock file path") > +SET(STATE_DIR_PREFIX "/usr/lib" CACHE STRING "Override opkg state directory prefix") > SET(PATH_SPEC "/usr/sbin:/usr/bin:/sbin:/bin" CACHE STRING "Override default PATH value") > SET(VERSION "" CACHE STRING "Override version") > > @@ -39,7 +40,7 @@ ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations > -DDATADIR="/usr/share" > -DOPKGETCDIR="/etc" > -DOPKGLOCKFILE="${LOCK_FILE}" > - -DOPKGLIBDIR="/usr/lib" > + -DOPKGLIBDIR="${STATE_DIR_PREFIX}" > -DHOST_CPU_STR="${HOST_CPU}" > -DBUILD_CPU=${BUILD_CPU} > -DPATH_SPEC="${PATH_SPEC}"
diff --git a/CMakeLists.txt b/CMakeLists.txt index 26230b3..f57fe10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ INCLUDE(TestBigEndian) SET(HOST_CPU "" CACHE STRING "Override Host CPU") SET(BUILD_CPU "" CACHE STRING "Override Host CPU") SET(LOCK_FILE "/var/lock/opkg.lock" CACHE STRING "Override lock file path") +SET(STATE_DIR_PREFIX "/usr/lib" CACHE STRING "Override opkg state directory prefix") SET(PATH_SPEC "/usr/sbin:/usr/bin:/sbin:/bin" CACHE STRING "Override default PATH value") SET(VERSION "" CACHE STRING "Override version") @@ -39,7 +40,7 @@ ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations -DDATADIR="/usr/share" -DOPKGETCDIR="/etc" -DOPKGLOCKFILE="${LOCK_FILE}" - -DOPKGLIBDIR="/usr/lib" + -DOPKGLIBDIR="${STATE_DIR_PREFIX}" -DHOST_CPU_STR="${HOST_CPU}" -DBUILD_CPU=${BUILD_CPU} -DPATH_SPEC="${PATH_SPEC}"
Signed-off-by: Patrick McDermott <patrick.mcdermott@libiquity.com> --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)