FreeBSD Bugzilla – Attachment 227911 Details for
Bug 257708
devel/stlink: Fails to build on 32-bit architectures: error: implicit conversion loses integer precision
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
devel/stlink: fix build on 32 bit platforms
0001-devel-stlink-fix-build-on-32-bit-platforms.patch (text/plain), 6.39 KB, created by
Robert Clausecker
on 2021-09-15 10:15:08 UTC
(
hide
)
Description:
devel/stlink: fix build on 32 bit platforms
Filename:
MIME Type:
Creator:
Robert Clausecker
Created:
2021-09-15 10:15:08 UTC
Size:
6.39 KB
patch
obsolete
>From 5850ae99965776038e0e8713fb5ddf4afd7edeab Mon Sep 17 00:00:00 2001 >From: Robert Clausecker <fuz@fuz.su> >Date: Sun, 22 Aug 2021 18:54:30 +0200 >Subject: [PATCH] devel/stlink: fix build on 32 bit platforms > >--- > devel/stlink/Makefile | 21 +++++------- > devel/stlink/files/patch-CMakeLists.txt | 8 +++-- > .../files/patch-cmake_modules_c__flags.cmake | 12 +++++++ > .../patch-doc_dev_pkg-config_CMakeLists.txt | 6 ++-- > .../stlink/files/patch-doc_man_CMakeLists.txt | 6 ++-- > devel/stlink/files/patch-src_common.c | 34 +++++++++++++++++++ > 6 files changed, 66 insertions(+), 21 deletions(-) > create mode 100644 devel/stlink/files/patch-cmake_modules_c__flags.cmake > create mode 100644 devel/stlink/files/patch-src_common.c > >diff --git a/devel/stlink/Makefile b/devel/stlink/Makefile >index 868b83d36d58..94bc8e492f46 100644 >--- a/devel/stlink/Makefile >+++ b/devel/stlink/Makefile >@@ -1,7 +1,6 @@ > PORTNAME= stlink > PORTVERSION= 1.7.0 > DISTVERSIONPREFIX= v >-PORTREVISION= 0 > CATEGORIES= devel > > MAINTAINER= lev@FreeBSD.org >@@ -9,17 +8,10 @@ COMMENT= STM32 ST-Link JTAG variant tools > > LICENSE= BSD3CLAUSE > >-OPTIONS_DEFINE= GTK3 DOCS >-OPTIONS_SUB= yes >-GTK3_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-pacth-turn-off-gtk >-GTK3_USES= gnome >-GTK3_USE= GNOME=gtk30 >- >-USE_GITHUB= yes >-GH_ACCOUNT= stlink-org >- > USES= cmake pkgconfig > USE_CSTD= c99 >+USE_GITHUB= yes >+GH_ACCOUNT= stlink-org > USE_LDCONFIG= yes > > PORTDOCS= README.md ${ALLDOCS} >@@ -27,10 +19,16 @@ PORTDOCS= README.md ${ALLDOCS} > ALLDOCS= compiling.md dev/developer.txt devices_boards.md \ > flashloaders.md release.md tutorial.md \ > version_support.md >- >+ > FLASHLOADERS= cleanroom.md linker.ld Makefile stm32f0.s stm32f4.s \ > stm32f4lv.s stm32f7.s stm32f7lv.s stm32l4.s stm32lx.s \ > >+OPTIONS_DEFINE= GTK3 DOCS >+OPTIONS_SUB= yes >+GTK3_USES= gnome >+GTK3_USE= GNOME=gtk30 >+GTK3_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-pacth-turn-off-gtk >+ > .include <bsd.port.pre.mk> > > post-install: >@@ -44,6 +42,5 @@ post-install: > .for F in ${FLASHLOADERS} > ${INSTALL_DATA} ${WRKSRC}/flashloaders/${F} ${STAGEDIR}${DATADIR}/${F} > .endfor >- > > .include <bsd.port.post.mk> >diff --git a/devel/stlink/files/patch-CMakeLists.txt b/devel/stlink/files/patch-CMakeLists.txt >index c17726682dc9..c8461f37f41b 100644 >--- a/devel/stlink/files/patch-CMakeLists.txt >+++ b/devel/stlink/files/patch-CMakeLists.txt >@@ -1,8 +1,10 @@ >---- CMakeLists.txt.orig 2021-07-13 15:04:41.612208000 +0300 >-+++ CMakeLists.txt 2021-07-13 15:06:16.763751332 +0300 >-@@ -299,4 +299,5 @@ >+--- CMakeLists.txt.orig 2021-09-15 09:54:35 UTC >++++ CMakeLists.txt >+@@ -298,6 +298,7 @@ endif () >+ # add_subdirectory(src/stlink-gui) # contains subordinate CMakeLists to build GUI > add_subdirectory(tests) # contains subordinate CMakeLists to build test executables > add_subdirectory(cmake/packaging) # contains subordinate CMakeLists to build packages > +add_subdirectory(doc/dev/pkg-config) # contains subordinate CMakeLists to build pkg-config descriptor > > option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF) >+ add_subdirectory(doc/man) # contains subordinate CMakeLists to generate manpages >diff --git a/devel/stlink/files/patch-cmake_modules_c__flags.cmake b/devel/stlink/files/patch-cmake_modules_c__flags.cmake >new file mode 100644 >index 000000000000..6cc2c1f2981c >--- /dev/null >+++ b/devel/stlink/files/patch-cmake_modules_c__flags.cmake >@@ -0,0 +1,12 @@ >+Work around upstream bug #1175 and make the build more robust >+against minor platform differences. -Werror should not be >+provided in release builds. >+ >+--- cmake/modules/c_flags.cmake.orig 2021-09-15 09:45:53 UTC >++++ cmake/modules/c_flags.cmake >+@@ -50,5 +50,4 @@ if (${CMAKE_BUILD_TYPE} MATCHES "Debug") >+ add_cflag_if_supported("-O0") >+ else () >+ add_cflag_if_supported("-O2") >+- add_cflag_if_supported("-Werror") >+ endif () >diff --git a/devel/stlink/files/patch-doc_dev_pkg-config_CMakeLists.txt b/devel/stlink/files/patch-doc_dev_pkg-config_CMakeLists.txt >index 42e007c084e4..1bb3871c36ef 100644 >--- a/devel/stlink/files/patch-doc_dev_pkg-config_CMakeLists.txt >+++ b/devel/stlink/files/patch-doc_dev_pkg-config_CMakeLists.txt >@@ -1,6 +1,6 @@ >---- doc/dev/pkg-config/CMakeLists.txt.orig 2021-04-25 01:24:02.000000000 +0300 >-+++ doc/dev/pkg-config/CMakeLists.txt 2021-07-13 15:09:25.486974252 +0300 >-@@ -11,5 +11,5 @@ >+--- doc/dev/pkg-config/CMakeLists.txt.orig 2021-04-24 22:24:02 UTC >++++ doc/dev/pkg-config/CMakeLists.txt >+@@ -11,5 +11,5 @@ configure_file( > > install( > FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" >diff --git a/devel/stlink/files/patch-doc_man_CMakeLists.txt b/devel/stlink/files/patch-doc_man_CMakeLists.txt >index fe262daea6fd..5d758bec75dd 100644 >--- a/devel/stlink/files/patch-doc_man_CMakeLists.txt >+++ b/devel/stlink/files/patch-doc_man_CMakeLists.txt >@@ -1,6 +1,6 @@ >---- doc/man/CMakeLists.txt.orig 2021-07-13 15:08:26.986789558 +0300 >-+++ doc/man/CMakeLists.txt 2021-04-25 01:24:02.000000000 +0300 >-@@ -30,7 +30,7 @@ >+--- doc/man/CMakeLists.txt.orig 2021-04-24 22:24:02 UTC >++++ doc/man/CMakeLists.txt >+@@ -30,7 +30,7 @@ foreach (manpage ${MANPAGES}) > endif () > > if (f AND NOT WIN32) >diff --git a/devel/stlink/files/patch-src_common.c b/devel/stlink/files/patch-src_common.c >new file mode 100644 >index 000000000000..28597bb71049 >--- /dev/null >+++ b/devel/stlink/files/patch-src_common.c >@@ -0,0 +1,34 @@ >+Partial application of upstream commit c8fc656, closing >+upstream bug #985 and #1175 and fixing the build on 32 >+bit platforms. >+ >+https://github.com/stlink-org/stlink/commit/c8fc6561fead79ad49c09d82bab864745086792c >+https://github.com/stlink-org/stlink/issues/985 >+https://github.com/stlink-org/stlink/issues/1175 >+ >+--- src/common.c.orig 2021-04-24 22:24:02 UTC >++++ src/common.c >+@@ -1,4 +1,5 @@ >+ #define DEBUG_FLASH 0 >++#include <limits.h> >+ #include <stdarg.h> >+ #include <stdint.h> >+ #include <stdio.h> >+@@ -2205,7 +2206,7 @@ static int map_file(mapped_file_t *mf, const char *pat >+ >+ if (sizeof(st.st_size) != sizeof(size_t)) { >+ // on 32 bit systems, check if there is an overflow >+- if (st.st_size > (off_t)INT32_MAX) { >++ if (st.st_size > (off_t)SSIZE_MAX) { >+ fprintf(stderr, "mmap() size_t overflow for file %s\n", path); >+ goto on_error; >+ } >+@@ -2219,7 +2220,7 @@ static int map_file(mapped_file_t *mf, const char *pat >+ goto on_error; >+ } >+ >+- mf->len = st.st_size; >++ mf->len = (size_t)st.st_size; >+ error = 0; // success >+ >+ on_error: >-- >2.32.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
koobs
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 257708
:
227367
| 227911