Linux multi arch #10359

wsnipex · 2016-08-29T13:24:41Z

supersedes #10348

This PR enables our cmake build system to automatically detect and use the correct library install dirs on various linux distributions. E.g. lib/x86_64-linux-gnu on debian, lib64 on Redhat based distros.
Its therefore possible to install 32 and 64bit kodi side by side and simplifies packaging.
On debian based distros this will only really show when CMAKE_INSTALL_PREFIX=/usr

The downside is that all binary addons need the following debian packaging change: wsnipex/pvr.vdr.vnsi@a9a2c3b

Test builds of this branch are available on mirrors, I'd appreciate feedback from all platforms that I didn't break anything (serious), but specially linux including rpi.

hudokkow · 2016-08-29T15:11:22Z

The downside is that all binary addons need the following debian packaging change

Only commenting to cc/ me and to say: Ouch! (No time to look at the code or update a couple of addons and test.)

project/cmake/CMakeLists.txt

@@ -117,7 +117,7 @@ endif()

 # Optional dependencies
 set(optional_deps MicroHttpd MySqlClient SSH XSLT
-                  Alsa UDEV DBus Avahi
+                  Alsa UDEV DBus Avahi SmbClient


fetzerch · 2016-08-31T06:23:52Z

Changes look ok, unfortunately I won't be able to test before the weekend.

project/cmake/KodiConfig.cmake.in

@@ -12,6 +12,9 @@ endif()
 if(NOT @APP_NAME_UC@_LIB_DIR)
  set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)
 endif()
+if(NOT @APP_NAME_UC@_DATA_DIR)
+  set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@)


hudokkow · 2016-09-07T18:45:30Z

Just ran it and mine shows

if(NOT KODI_DATA_DIR)
set(KODI_DATA_DIR /home/hudo/dev/tmp/master/share/kodi)
endif()

but I call cmake with -DCMAKE_INSTALL_PREFIX=foobar

How are you calling the config step?

hudokkow · 2016-09-07T18:49:13Z

Nope, that's not it. Calling without -DCMAKE_INSTALL_PREFIX=foobar sets it /usr/local/share/kodi, as it should.

MilhouseVH · 2016-09-07T18:53:41Z

We're still using configure, and project/cmake/KodiConfig.cmake is generated by configure from project/cmake/KodiConfig.cmake.in, right? But @APP_DATA_DIR@ isn't being output correctly.

MilhouseVH · 2016-09-07T18:56:33Z

Try:

./configure --prefix=/usr --libdir=/usr/foobar --datarootdir=/usr/foobar2

then look at project/cmake/KodiConfig.cmake:

if(NOT KODI_PREFIX)
  set(KODI_PREFIX /usr)
endif()
if(NOT KODI_INCLUDE_DIR)
  set(KODI_INCLUDE_DIR /usr/include/kodi)
endif()
if(NOT KODI_LIB_DIR)
  set(KODI_LIB_DIR /usr/foobar/kodi)
endif()
if(NOT KODI_DATA_DIR)
  set(KODI_DATA_DIR @APP_DATA_DIR@)
endif()

Not that it should be necessary to set a value for --datarootdir, as the default ${prefix}/share will work for us, but whatever value is set is ignored.

hudokkow · 2016-09-07T19:01:33Z

@APP_DATA_DIR@ is missing from configure.ac (https://github.com/xbmc/xbmc/blob/master/configure.ac#L2229)

wsnipex · 2016-09-07T19:28:43Z

right, I must have forgotten that when I changed it in cmake. Will fix tomorrow

Needed after xbmc/xbmc#10359

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

fetzerch and others added 5 commits August 29, 2016 11:30

[cmake] Fix lib/lib64 paths by using GNUInstallDirs module

d7bd76d

[cmake] don't use multi-arch for internal/wrapped libs

9a760f8

[cmake] Samba is an optional dependency

9d33e3d

[cmake] linux: use proper multi-arch install dirs

827974f

[binary-addons] linux: use multi-arch install dirs

441c73f

wsnipex added Type: Improvement non-breaking change which improves existing functionality CMake labels Aug 29, 2016

akva2 reviewed Aug 30, 2016
View reviewed changes

fetzerch mentioned this pull request Aug 31, 2016

[cmake] Fix lib/lib64 paths by using GNUInstallDirs module #10348

Closed

wsnipex mentioned this pull request Sep 5, 2016

fix deb packaging xbmc/inputstream.rtmp#3

Merged

wsnipex merged commit 07b0f62 into xbmc:master Sep 6, 2016

MartijnKaijser modified the milestone: Krypton 17.0-beta2 Sep 6, 2016

MilhouseVH reviewed Sep 7, 2016
View reviewed changes

project/cmake/KodiConfig.cmake.in

@@ -12,6 +12,9 @@ endif()

if(NOT @APP_NAME_UC@_LIB_DIR)

set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)

endif()

if(NOT @APP_NAME_UC@_DATA_DIR)

set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@)

This comment was marked as spam.

Sign in to view

hudokkow mentioned this pull request Sep 7, 2016

[autotools] Add missing APP_DATA_DIR in configure.ac #10426

Merged

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Sep 9, 2016

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

23c1872

Needed after xbmc/xbmc#10359

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Sep 9, 2016

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

be2074b

Needed after xbmc/xbmc#10359

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Sep 9, 2016

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

8cc17ed

Needed after xbmc/xbmc#10359

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Sep 10, 2016

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

11ca71f

Needed after xbmc/xbmc#10359

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Sep 11, 2016

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

440ae94

Needed after xbmc/xbmc#10359

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Sep 11, 2016

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

053d92a

Needed after xbmc/xbmc#10359

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Sep 11, 2016

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

44a2ab2

Needed after xbmc/xbmc#10359

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Jan 27, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

f94bb1a

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Jan 28, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

a0717b5

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Jan 28, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

4f0b875

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Jan 29, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

1a6fdf3

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Jan 29, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

c4f16d2

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Jan 30, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

9cf4a63

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Jan 31, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

78da069

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Jan 31, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

a19493a

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Jan 31, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

fdca656

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Jan 31, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

8f1845f

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 1, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

854a8e3

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 1, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

4bd575c

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 1, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

3927c73

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 2, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

690d5fa

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 2, 2017

package/kodi-adsp-biquad-filters: Add -DOVERRIDE_PATHS=1 to all binar…

5dbbe7d

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 3, 2017

package/kodi-adsp-biquad-filters: Add -DOVERRIDE_PATHS=1 to all binar…

b14da78

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 4, 2017

package/kodi-adsp-biquad-filters: Add -DOVERRIDE_PATHS=1 to all binar…

723c94e

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 4, 2017

package/kodi-adsp-biquad-filters: Add -DOVERRIDE_PATHS=1 to all binar…

40e4cc4

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 4, 2017

package/kodi-adsp-biquad-filters: Add -DOVERRIDE_PATHS=1 to all binar…

77ac97d

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 4, 2017

package/kodi-adsp-biquad-filters: Add -DOVERRIDE_PATHS=1 to all binar…

fe88b8e

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 6, 2017

package/kodi-adsp-biquad-filters: Add -DOVERRIDE_PATHS=1 to all binar…

613d007

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 8, 2017

package/kodi-adsp-biquad-filters: Add -DOVERRIDE_PATHS=1 to all binar…

f543c5a

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 9, 2017

package/kodi-adsp-biquad-filters: Add -DOVERRIDE_PATHS=1 to all binar…

a2e8012

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 11, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

bdb1b2b

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 11, 2017

package/kodi-adsp-biquad-filters: Add -DOVERRIDE_PATHS=1 to all binar…

364abf2

…y addons Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 12, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

a05493a

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 13, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

0914906

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 14, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

e603aea

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 16, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

ee8f891

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

bkuhls added a commit to bkuhls/buildroot that referenced this pull request Feb 17, 2017

package/kodi.*: Add -DOVERRIDE_PATHS=1 to all binary addons

5772fb3

Needed after xbmc/xbmc#10359 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Linux multi arch #10359

Linux multi arch #10359

wsnipex commented Aug 29, 2016 •

edited

Loading

hudokkow commented Aug 29, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

fetzerch commented Aug 31, 2016

This comment was marked as spam.

hudokkow commented Sep 7, 2016

hudokkow commented Sep 7, 2016

MilhouseVH commented Sep 7, 2016

MilhouseVH commented Sep 7, 2016 •

edited

Loading

hudokkow commented Sep 7, 2016

wsnipex commented Sep 7, 2016

Linux multi arch #10359

Linux multi arch #10359

Conversation

wsnipex commented Aug 29, 2016 • edited Loading

hudokkow commented Aug 29, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

fetzerch commented Aug 31, 2016

This comment was marked as spam.

hudokkow commented Sep 7, 2016

hudokkow commented Sep 7, 2016

MilhouseVH commented Sep 7, 2016

MilhouseVH commented Sep 7, 2016 • edited Loading

hudokkow commented Sep 7, 2016

wsnipex commented Sep 7, 2016

wsnipex commented Aug 29, 2016 •

edited

Loading

MilhouseVH commented Sep 7, 2016 •

edited

Loading