fix #700 #701

slyshykO · 2018-03-30T05:47:22Z

Use CMAKE_INSTALL_PREFIX for install paths

Need to approve from @cedricboudinet and @Vascom

Use CMAKE_INSTALL_PREFIX for install paths

Vascom

CMAKE_INSTALL_PREFIX not needed.

CMakeLists.txt

slyshykO · 2018-03-30T07:08:30Z

Hi, Vasilii. Did you remove cmake cache before the test? пт, 30 мар. 2018 г., 9:41 Vasiliy Glazov <notifications@github.com>:

…

***@***.**** commented on this pull request. CMAKE_INSTALL_PREFIX not needed. ------------------------------ In CMakeLists.txt <#701 (comment)>: > @@ -5,17 +5,7 @@ set(PROJECT_DESCRIPTION "Open source version of the STMicroelectronics Stlink To set(STLINK_UDEV_RULES_DIR "/etc/udev/rules.d" CACHE PATH "Udev rules directory") set(STLINK_MODPROBED_DIR "/etc/modprobe.d" CACHE PATH "modprobe.d directory") set(LIB_INSTALL_DIR "lib" CACHE PATH "Main library directory") - -if(IS_DIRECTORY CMAKE_LIBRARY_PATH) -else() - set(CMAKE_LIBRARY_PATH "lib") -endif() - -if (WIN32) - set(STLINK_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} CACHE PATH "Target lib directory") -else() - set(STLINK_LIBRARY_PATH "${LIB_INSTALL_DIR}/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory") -endif(WIN32) +set(STLINK_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" CACHE PATH "Target lib directory") Seems that LIB_INSTALL_DIR already /usr/lib64 and CMAKE_INSTALL_PREFIX = /usr. So lib installed to /usr/usr/lib64/ Need to remove CMAKE_INSTALL_PREFIX from this line. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#701 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABgKcUfQ5oAJC0kqqvYzvtixsKAhwd12ks5tjdO1gaJpZM4TBU4N> .

Vascom · 2018-03-30T07:17:21Z

I don't know how to remove it. But on clean installed build environment it has same error:

Installing: /builddir/build/BUILDROOT/stlink-1.5.0-1.fc27.x86_64/usr/usr/lib64/libstlink.so.1.5.0

Full build log https://kojipkgs.fedoraproject.org//work/tasks/5046/26055046/build.log
https://koji.fedoraproject.org/koji/taskinfo?taskID=26055046

P.S. Don't see to version 1.5.0, it use zip from your branch fix-linux-install.

Vascom · 2018-03-30T08:46:46Z

Not work.
In CMakeCache.txt it has lines:

//No help, variable specified on the command line.
LIB_INSTALL_DIR:PATH=/usr/lib64

//Target include directory
STLINK_INCLUDE_PATH:PATH=/usr/usr/include

//Target lib directory
STLINK_LIBRARY_PATH:PATH=/usr/usr/lib64

slyshykO · 2018-03-30T09:00:00Z

Vasiliy. You pass to cmake those variables from a command line:
CMAKE_INSTALL_PREFIX:PATH=/usr
INCLUDE_INSTALL_DIR:PATH=/usr/include
LIB_INSTALL_DIR:PATH=/usr/lib64

Can you change that to:
CMAKE_INSTALL_PREFIX:PATH=/usr
INCLUDE_INSTALL_DIR:PATH=include
LIB_INSTALL_DIR:PATH=lib64

And I, respectively, will set in cmake only:
set(STLINK_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}" CACHE PATH "Target lib directory")
set(STLINK_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" CACHE PATH "Target include directory")

without any checks

Vascom

Wrong parameters expansion.

CMakeLists.txt

Vascom · 2018-03-30T09:05:09Z

Can you change that to:

I can't change it. You need just correct variables in "if("

Vascom · 2018-03-30T09:26:57Z

Now all OK.

slyshykO · 2018-03-30T09:30:38Z

Will wait for approving from Debian guy.

xor-gate · 2018-03-30T09:32:33Z

@bluca and @zoobab are the guys who did some debian packaging and could probably verify this works.

bluca · 2018-03-30T11:12:47Z

I'm not a CMake expert (in fact I have an intense dislike for it...), but something is not right:
as of #683 everything was working fine for me, with the following config:

cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_LIBRARY_PATH=x86_64-linux-gnu -DSTLINK_UDEV_RULES_DIR=/lib/udev/rules.d

I got what I needed:

$ dpkg -c libstlink1_1.5.0+ds-1_amd64.deb 
drwxr-xr-x root/root         0 2018-03-16 16:56 ./
drwxr-xr-x root/root         0 2018-03-16 16:56 ./usr/
drwxr-xr-x root/root         0 2018-03-16 16:56 ./usr/lib/
drwxr-xr-x root/root         0 2018-03-16 16:56 ./usr/lib/x86_64-linux-gnu/
-rw-r--r-- root/root     80256 2018-03-16 16:56 ./usr/lib/x86_64-linux-gnu/libstlink.so.1.5.0
drwxr-xr-x root/root         0 2018-03-16 16:56 ./usr/share/
drwxr-xr-x root/root         0 2018-03-16 16:56 ./usr/share/doc/
drwxr-xr-x root/root         0 2018-03-16 16:56 ./usr/share/doc/libstlink1/
-rw-r--r-- root/root      2175 2018-03-16 16:56 ./usr/share/doc/libstlink1/changelog.Debian.gz
-rw-r--r-- root/root      2751 2018-02-19 19:00 ./usr/share/doc/libstlink1/changelog.gz
-rw-r--r-- root/root      9922 2018-03-16 16:56 ./usr/share/doc/libstlink1/copyright
lrwxrwxrwx root/root         0 2018-03-16 16:56 ./usr/lib/x86_64-linux-gnu/libstlink.so.1 -> libstlink.so.1.5.0

Building from this PR this doesn't work anymore, CMAKE_LIBRARY_PATH is ignored, this is where libraries are installed now:

$ find debian/tmp/usr/lib/
debian/tmp/usr/lib/
debian/tmp/usr/lib/libstlink.so.1
debian/tmp/usr/lib/libstlink.so.1.4.0
debian/tmp/usr/lib/libstlink.so
debian/tmp/usr/lib/pkgconfig
debian/tmp/usr/lib/pkgconfig/stlink.pc
debian/tmp/usr/lib/libstlink.a

Setting LIB_INSTALL_DIR:

cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DLIB_INSTALL_DIR=debian/tmp/usr/lib/x86_64-linux-gnu -DSTLINK_UDEV_RULES_DIR=/lib/udev/rules.d

Makes it even worse, not sure where that path is coming from:

$ find debian/tmp/usr/home
debian/tmp/usr/home
debian/tmp/usr/home/bluca
debian/tmp/usr/home/bluca/git
debian/tmp/usr/home/bluca/git/stlink
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu/debian
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu/debian/tmp
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu/debian/tmp/usr
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu/debian/tmp/usr/lib
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu/debian/tmp/usr/lib/x86_64-linux-gnu
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu/debian/tmp/usr/lib/x86_64-linux-gnu/libstlink.so.1
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu/debian/tmp/usr/lib/x86_64-linux-gnu/libstlink.so.1.4.0
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu/debian/tmp/usr/lib/x86_64-linux-gnu/libstlink.so
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/stlink.pc
debian/tmp/usr/home/bluca/git/stlink/obj-x86_64-linux-gnu/debian/tmp/usr/lib/x86_64-linux-gnu/libstlink.a

Not sure what to change though, sorry

Vascom · 2018-03-30T11:19:41Z

@bluca You set
-DLIB_INSTALL_DIR=debian/tmp/usr/lib/x86_64-linux-gnu
Just change it to
-DLIB_INSTALL_DIR=/usr/lib/x86_64-linux-gnu/

bluca · 2018-03-30T11:26:22Z

That works, thanks (as I said, not CMake expert).

Note that headers have changed path too - that is fine if they are static and arch-independent

Vascom · 2018-03-30T11:29:10Z

@bluca Headers always arch independent and placed to /usr/include/stlink.

xor-gate · 2018-04-02T08:52:13Z

@bluca I understand the frustration of cmake compared to autoconf build system. But it is unmaintainable and hard to write and read for developers in a cross platform way, it is easier to understand for packaging people (almost standard build parameters). Are we good now with this PR? What about the defaults without using any build parameters does it work for make install ?

joede · 2018-04-12T05:27:12Z

@slyshykO had asked me to test his branch. It doesn't work for me here with Debian 9! IMO the debian/*.install files are wrong.

   dh_install -O--buildsystem=cmake
dh_install: Cannot find (any matches for) "usr/lib/*/lib*.a" (tried in "." and "debian/tmp")
dh_install: libstlink-dev missing files: usr/lib/*/lib*.a
dh_install: Cannot find (any matches for) "usr/lib/*/pkgconfig/*" (tried in "." and "debian/tmp")
dh_install: libstlink-dev missing files: usr/lib/*/pkgconfig/*
dh_install: Cannot find (any matches for) "usr/lib/*/lib*.so" (tried in "." and "debian/tmp")
dh_install: libstlink-dev missing files: usr/lib/*/lib*.so
dh_install: Cannot find (any matches for) "usr/lib/*/lib*.so.*" (tried in "." and "debian/tmp")
dh_install: libstlink1 missing files: usr/lib/*/lib*.so.*
dh_install: missing files, aborting
debian/rules:14: die Regel für Ziel „binary“ scheiterte

bluca · 2018-04-12T07:19:20Z

The install files are correct, as mentioned above the cmake options are changing in an incompatible way so debian/rules needs to be updated accordingly

joede · 2018-04-12T09:29:48Z

@bluca the removal of the wildcard in lib/*/ may be fixed by your CMake changes. I'm no CMake expert. What is wrong with the cmake usage for debian/rules? And why are the wildcards inside the path needed?

But there are at least two glitches in the .install files.

as far as I know the pathes must be relative and not absolute! So I removed the leading /!
the -dev package should not have the .so file included. This is installed by the library package.

bluca · 2018-04-12T10:01:08Z

@slyshykO could you please also apply this patch together with your changes:

--- a/debian/rules
+++ b/debian/rules
@@ -15,5 +15,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
        dh_auto_configure -- \
-    -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+    -DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
     -DSTLINK_UDEV_RULES_DIR='/lib/udev/rules.d'

What is wrong with the cmake usage for debian/rules?

The CMake options are being changed so the CMake parameter used in d/rules doesn't work anymore. The fix is above.

And why are the wildcards inside the path needed?

Multiarch, see section 9.1.1.4 of the Policy: https://www.debian.org/doc/debian-policy/

as far as I know the pathes must be relative and not absolute! So I removed the leading /!

dh_install works fine with either, but feel free to change that if you wish

the -dev package should not have the .so file included. This is installed by the library package.

The unversioned symlink goes into the -dev package, see section 8.4 of the Policy:
https://www.debian.org/doc/debian-policy/#development-files

joede · 2018-04-12T10:13:07Z

@slyshykO you should use =/usr/lib/$(DEB_HOST_MULTIARCH) instead of =$(DEB_HOST_MULTIARCH). ;-)

joede · 2018-04-12T10:29:46Z

@bluca after the last change of @slyshykO, I was able to built .deb Debian packages from his repository. Looks good so far. ;-)

Is somebody using a Github repository as source for apt? IMO it would be nice to have a source for this new packages. ;-)

bluca · 2018-04-12T10:33:10Z

I've uploaded it to Debian, it will be available after it's been reviewed (no ETA), afterwards I'll upload to stretch-backports as well

joede · 2018-04-12T10:36:05Z

@bluca stlink is neither in testing nore in unstable yet. How can it be uploaded to stretch-backports?

bluca · 2018-04-12T10:43:55Z

That's what I meant with "afterwards" - once it's approved and it's in unstable/testing

slyshykO · 2018-04-16T13:57:34Z

@xor-gate , I think, it is ready for merge.

…are merged.

first try to fix stlink-org#700

ea9d12d

Use CMAKE_INSTALL_PREFIX for install paths

Vascom reviewed Mar 30, 2018

View reviewed changes

CMakeLists.txt Outdated Show resolved Hide resolved

check IS_DIRECTORY LIB_INSTALL_DIR

eaa83e9

slyshykO changed the title ~~first try to fix #700~~ first try to fix #700 (WIP, not ready for merge) Mar 30, 2018

Vascom reviewed Mar 30, 2018

View reviewed changes

CMakeLists.txt Show resolved Hide resolved

CMakeLists.txt Outdated Show resolved Hide resolved

fix incorrect VAR usage in condition

102f421

Vascom mentioned this pull request Mar 30, 2018

Installation issue under linux #700

Closed

slyshykO mentioned this pull request Apr 11, 2018

Fix of build errors for Debian Stretch #707

Closed

changed debian/rules according to @bluca patch

ae4e6a0

slyshykO force-pushed the fix-linux-install branch from 1ce17f2 to ae4e6a0 Compare April 12, 2018 10:19

slyshykO changed the title ~~first try to fix #700 (WIP, not ready for merge)~~ first try to fix #700 Apr 12, 2018

slyshykO changed the title ~~first try to fix #700~~ fix #700 Apr 12, 2018

xor-gate approved these changes Apr 16, 2018

View reviewed changes

xor-gate merged commit 8893533 into stlink-org:master Apr 16, 2018

joede pushed a commit to joede/stlink that referenced this pull request Apr 17, 2018

rebase with vendor after the fixes stlink-org#700 and stlink-org#701 …

b5e71d8

…are merged.

slyshykO deleted the fix-linux-install branch May 12, 2019 07:45

Nightwalker-87 added this to the v1.5.1 milestone Feb 23, 2020

slyshykO mentioned this pull request Mar 1, 2020

[distribution] 'make package' for debian based distros #845

Closed

Nightwalker-87 added bug/fixed bug/packaging status/resolved os/linux and removed os/linux labels Mar 18, 2020

Nightwalker-87 linked an issue Mar 18, 2020 that may be closed by this pull request

Installation issue under linux #700

Closed

Nightwalker-87 mentioned this pull request Mar 26, 2020

Windows MinGW64 executables have problems #438

Closed

slyshykO mentioned this pull request Apr 12, 2020

Unable to build on ubuntu #698

Closed

stlink-org locked as resolved and limited conversation to collaborators Apr 14, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix #700 #701

fix #700 #701

slyshykO commented Mar 30, 2018

Vascom left a comment

slyshykO commented Mar 30, 2018 via email

Vascom commented Mar 30, 2018 •

edited

Vascom commented Mar 30, 2018

slyshykO commented Mar 30, 2018

Vascom left a comment

Vascom commented Mar 30, 2018 •

edited

Vascom commented Mar 30, 2018

slyshykO commented Mar 30, 2018

xor-gate commented Mar 30, 2018 •

edited

bluca commented Mar 30, 2018

Vascom commented Mar 30, 2018

bluca commented Mar 30, 2018

Vascom commented Mar 30, 2018

xor-gate commented Apr 2, 2018 •

edited

joede commented Apr 12, 2018

bluca commented Apr 12, 2018

joede commented Apr 12, 2018

bluca commented Apr 12, 2018

joede commented Apr 12, 2018

joede commented Apr 12, 2018

bluca commented Apr 12, 2018

joede commented Apr 12, 2018

bluca commented Apr 12, 2018

slyshykO commented Apr 16, 2018

fix #700 #701

fix #700 #701

Conversation

slyshykO commented Mar 30, 2018

Vascom left a comment

Choose a reason for hiding this comment

slyshykO commented Mar 30, 2018 via email

Vascom commented Mar 30, 2018 • edited

Vascom commented Mar 30, 2018

slyshykO commented Mar 30, 2018

Vascom left a comment

Choose a reason for hiding this comment

Vascom commented Mar 30, 2018 • edited

Vascom commented Mar 30, 2018

slyshykO commented Mar 30, 2018

xor-gate commented Mar 30, 2018 • edited

bluca commented Mar 30, 2018

Vascom commented Mar 30, 2018

bluca commented Mar 30, 2018

Vascom commented Mar 30, 2018

xor-gate commented Apr 2, 2018 • edited

joede commented Apr 12, 2018

bluca commented Apr 12, 2018

joede commented Apr 12, 2018

bluca commented Apr 12, 2018

joede commented Apr 12, 2018

joede commented Apr 12, 2018

bluca commented Apr 12, 2018

joede commented Apr 12, 2018

bluca commented Apr 12, 2018

slyshykO commented Apr 16, 2018

Vascom commented Mar 30, 2018 •

edited

Vascom commented Mar 30, 2018 •

edited

xor-gate commented Mar 30, 2018 •

edited

xor-gate commented Apr 2, 2018 •

edited