Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix of build errors for Debian Stretch #707

Closed
wants to merge 2 commits into from
Closed

Fix of build errors for Debian Stretch #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ee3d4e
made some fixes to make the Debian build system compile the packages.
joede Apr 11, 2018
7263a81
add a temporary directory to gitignore.
joede Apr 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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")
set(STLINK_LIBRARY_PATH "${LIB_INSTALL_DIR}" CACHE PATH "Target lib directory")
endif(WIN32)

option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF)
Expand Down
1 change: 1 addition & 0 deletions debian/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ debhelper-build-stamp
*.substvars
libstlink-dev
libstlink
libstlink1
stlink-gui
stlink-tools
tmp
8 changes: 8 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
stlink (1.5.0~joede9+1) stretch-backports; urgency=medium

* Ported for stretch-experimental. Some of the debian/*.install
files doesn't work as expected. I had to remove some
unnecessary pathes from some CMakelist.txt files.

-- Joerg Desch <[email protected]> Wed, 11 Apr 2018 16:34:24 +0200

stlink (1.5.0) unstable; urgency=medium

[ Jerry Jacobs ]
Expand Down
6 changes: 3 additions & 3 deletions debian/libstlink-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
usr/include/*
usr/lib/*/lib*.a
usr/lib/*/pkgconfig/*
usr/lib/*/lib*.so
usr/lib/libstlink*.a
usr/lib/pkgconfig/*
#usr/lib/libstlink*.so

2 changes: 1 addition & 1 deletion debian/libstlink1.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
usr/lib/*/lib*.so.*
usr/lib/libstlink*.so*
4 changes: 2 additions & 2 deletions debian/stlink-gui.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/usr/bin/stlink-gui*
/usr/share/stlink/stlink-gui.ui
usr/bin/stlink-gui*
usr/share/stlink/stlink-gui.ui
2 changes: 1 addition & 1 deletion debian/stlink-tools.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/usr/bin/st-*
usr/bin/st-*
lib/udev/rules.d/*.rules
etc/modprobe.d/*.conf
4 changes: 2 additions & 2 deletions include/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ file(GLOB STLINK_HEADERS
"${CMAKE_BINARY_DIR}/include/stlink/*.h"
)
install(FILES ${CMAKE_SOURCE_DIR}/include/stlink.h
DESTINATION include/${CMAKE_LIBRARY_PATH}
DESTINATION include
)
install(FILES ${STLINK_HEADERS}
DESTINATION include/${CMAKE_LIBRARY_PATH}/stlink
DESTINATION include/stlink
)