-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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.
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
[macos ci] update 2021-07-27 #19207
Merged
Merged
[macos ci] update 2021-07-27 #19207
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
d5e6c62
update 2021-07-27
strega-nil 9bda7b6
update azure-pipelines
strega-nil 0755ada
update sha of macfuse
strega-nil 3bc94b9
change how macos-ci-base works
strega-nil a346e4b
fix build errors
strega-nil 6600a41
fix itpp:linux
strega-nil 051c00b
more fixes
strega-nil 2759d5a
remove tab
strega-nil a4b1ce8
allow version changes in all the remove/rename-version patches
strega-nil 3eb1da8
fix libunistring for real
strega-nil f4dcf73
robert CR
strega-nil File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -34,14 +34,14 @@ | ||
if (MSVC) | ||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4232") | ||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4232") | ||
# Make warning as error | ||
- add_definitions(/WX) | ||
+ #add_definitions(/WX) | ||
else() | ||
# Make warning as error | ||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") | ||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") | ||
+ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") | ||
+ #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") | ||
endif() | ||
|
||
IF(WIN32) | ||
# windows needs this define | ||
add_definitions(-D_CRT_SECURE_NO_WARNINGS) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
--- a/interface/coroutine/frame.h | ||
+++ a/interface/coroutine/frame.h | ||
@@ -119,8 +119,8 @@ | ||
return *this; | ||
} | ||
// 17.12.3.2, export/import | ||
- static /*constexpr*/ coroutine_handle from_address(void* _Addr) { | ||
+ static /*constexpr*/ coroutine_handle from_address(void* _Addr) noexcept { | ||
coroutine_handle _Result{}; | ||
_Result._Ptr = reinterpret_cast<portable_coro_prefix*>(_Addr); | ||
return _Result; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
--- a/autogen.sh | ||
+++ b/autogen.sh | ||
@@ -25,6 +25,6 @@ | ||
|
||
-PV=$(cat VERSION | cut -d' ' -f1) | ||
-LV=$(cat VERSION | cut -d' ' -f2) | ||
-if test "x$(cat VERSION | cut -d' ' -f3)" = "xsvn"; then | ||
+PV=$(cat VERSION.txt | cut -d' ' -f1) | ||
+LV=$(cat VERSION.txt | cut -d' ' -f2) | ||
+if test "x$(cat VERSION.txt | cut -d' ' -f3)" = "xsvn"; then | ||
if test -d ".git/svn"; then | ||
REV=$(LC_ALL=C git svn find-rev HEAD) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"name": "itpp", | ||
"version-semver": "4.3.1", | ||
"port-version": 6, | ||
"port-version": 7, | ||
"description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.", | ||
"homepage": "http://itpp.sourceforge.net" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
Source: libodb-boost | ||
Version: 2.4.0-3 | ||
Version: 2.4.0 | ||
Port-Version: 4 | ||
Description: Description: Boost support for the ODB ORM library | ||
Build-Depends: libodb |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
Source: libodb-pgsql | ||
Version: 2.4.0-3 | ||
Version: 2.4.0 | ||
Port-Version: 4 | ||
Homepage: https://www.codesynthesis.com/products/odb/ | ||
Description: Description: PostgreSQL support for the ODB ORM library | ||
Build-Depends: libodb, libpq |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
Source: libodb-sqlite | ||
Version: 2.4.0 | ||
Port-Version: 7 | ||
Port-Version: 8 | ||
Homepage: https://www.codesynthesis.com/products/odb/ | ||
Description: Sqlite support for the ODB ORM library | ||
Build-Depends: libodb, sqlite3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"name": "libodb", | ||
"version": "2.4.0", | ||
"port-version": 7, | ||
"port-version": 8, | ||
"description": "ODB library, base runtime for the ODB ORM solution", | ||
"homepage": "https://www.codesynthesis.com/products/odb/" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -17,10 +17,10 @@ | ||
dnl Process this file with autoconf to produce a configure script. | ||
|
||
AC_PREREQ([2.63]) | ||
-AC_INIT | ||
+AC_INIT([unistring], [0.9.10]) | ||
AC_CONFIG_SRCDIR([lib/unistring/version.in.h]) | ||
AC_CONFIG_AUX_DIR([build-aux]) | ||
. $srcdir/version.sh | ||
-gl_INIT_PACKAGE([libunistring], [$VERSION_NUMBER]) | ||
+#gl_INIT_PACKAGE([libunistring], [$VERSION_NUMBER]) | ||
AM_INIT_AUTOMAKE([silent-rules dist-xz]) | ||
AM_CONFIG_HEADER([config.h]) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -20,8 +20,8 @@ | ||
######################################## | ||
## nanodbc version | ||
######################################## | ||
-file(STRINGS VERSION NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+") | ||
+file(STRINGS "VERSION.txt" NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+") | ||
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" NANODBC_VERSION_MAJOR "${NANODBC_VERSION}") | ||
string(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" NANODBC_VERSION_MINOR "${NANODBC_VERSION}") | ||
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" NANODBC_VERSION_PATCH "${NANODBC_VERSION}") | ||
message(STATUS "nanodbc version: ${NANODBC_VERSION}") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"name": "nanodbc", | ||
"version": "2.13.0", | ||
"port-version": 4, | ||
"description": "A small C++ wrapper for the native C ODBC API.", | ||
"homepage": "https://github.com/nanodbc/nanodbc", | ||
"dependencies": [ | ||
{ | ||
"name": "unixodbc", | ||
"platform": "!windows" | ||
} | ||
] | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
{ | ||
"name": "plplot", | ||
"version-string": "5.13.0", | ||
"port-version": 10, | ||
"description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.", | ||
"dependencies": [ | ||
"bzip2", | ||
"freetype", | ||
"libpng", | ||
"zlib" | ||
], | ||
"features": { | ||
"wxwidgets": { | ||
"description": "plplot wxwidgets module", | ||
"dependencies": [ | ||
"wxwidgets" | ||
] | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
--- a/selene/img/pixel/Pixel.hpp | ||
+++ b/selene/img/pixel/Pixel.hpp | ||
@@ -45,6 +45,6 @@ | ||
constexpr Pixel() noexcept = default; ///< Default constructor. Pixel values are uninitialized. | ||
|
||
- template <typename... Args, typename = std::enable_if_t<sizeof...(Args) == nr_channels_>> | ||
- constexpr Pixel(Args... args) noexcept; | ||
+ template <typename Arg1, typename... Args, typename = std::enable_if_t<sizeof...(Args) + 1 == nr_channels_>> | ||
+ constexpr Pixel(Arg1 arg1, Args... args) noexcept; | ||
|
||
constexpr explicit Pixel(const std::array<T, nr_channels>& arr) noexcept; | ||
@@ -216,8 +216,8 @@ | ||
template <typename T, std::size_t nr_channels_, PixelFormat pixel_format_> | ||
-template <typename... Args, typename> | ||
-constexpr Pixel<T, nr_channels_, pixel_format_>::Pixel(Args... args) noexcept | ||
- : data_{{static_cast<T>(args)...}} | ||
+template <typename Arg1, typename... Args, typename> | ||
+constexpr Pixel<T, nr_channels_, pixel_format_>::Pixel(Arg1 arg1, Args... args) noexcept | ||
+ : data_{{static_cast<T>(arg1), static_cast<T>(args)...}} | ||
{ | ||
static_assert(std::is_trivial<Pixel<T, nr_channels_, pixel_format_>>::value, "Pixel type is not trivial"); | ||
static_assert(std::is_standard_layout<Pixel<T, nr_channels_, pixel_format_>>::value, | ||
"Pixel type is not standard layout"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please take a look at this @ras0219
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like a patch that will break on next update -- instead, I think it would make sense to expect an environment variable in
AC_INIT
:which we can then set in the portfile as
set(ENV{UNISTRING_VERSION} <version>)
, I believe.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(Also, more info about gl_INIT_PACKAGE here: https://lists.gnu.org/archive/html/automake/2009-05/msg00145.html)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay I've fixed this for real. I now know way, way too much about autoconf.