Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-115119: Default to --with-system-libmpdec=yes#118539

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
14 commits
Select commitHold shift + click to select a range
268d270
gh-115119: Default to --with-system-libmpdec=yes
erlend-aaslandMay 3, 2024
45173e3
Pull in main
erlend-aaslandMay 5, 2024
6f020d0
Use the same style as the surrounding code
erlend-aaslandMay 5, 2024
fe56023
Fail if --with-system-libmpdec is given but no library was found
erlend-aaslandMay 5, 2024
0006897
Address review: warn if bundled version is used
erlend-aaslandMay 5, 2024
4f87c91
Address review: warn if system library was not found
erlend-aaslandMay 5, 2024
f8f4ea2
For now, build with bundled libmpdec in Ubuntu CIs
erlend-aaslandMay 5, 2024
8e80866
Add NEWS
erlend-aaslandMay 5, 2024
e51c1f7
What's New
erlend-aaslandMay 5, 2024
a971a26
Actually use bundled version if told to do so
erlend-aaslandMay 5, 2024
e3f3e17
Address review: add deprecated-removed directive regarding the remova…
erlend-aaslandMay 6, 2024
c84f2b7
Add libmpdec-dev to CI deps, remove CI hack, and enforce mpdecimal ve…
erlend-aaslandMay 6, 2024
161d50b
Pull in main
erlend-aaslandMay 6, 2024
1016f0d
Make the mpdec link check more accurate, and use LIBS iso. LDFLAGS
erlend-aaslandMay 6, 2024
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
PrevPrevious commit
NextNext commit
Add libmpdec-dev to CI deps, remove CI hack, and enforce mpdecimal ve…
…rsion check in configure
  • Loading branch information
@erlend-aasland
erlend-aasland committedMay 6, 2024
commitc84f2b7105ca29c4a40c0ac8eb0db1fae8ebf553
11 changes: 4 additions & 7 deletions.github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -232,8 +232,7 @@ jobs:
../cpython-ro-srcdir/configure \
--config-cache \
--with-pydebug \
--with-openssl=$OPENSSL_DIR \
--with-system-libmpdec=no
--with-openssl=$OPENSSL_DIR

build_ubuntu_free_threading:
name: 'Ubuntu (free-threading)'
Expand All@@ -247,8 +246,7 @@ jobs:
--config-cache \
--with-pydebug \
--with-openssl=$OPENSSL_DIR \
--disable-gil \
--with-system-libmpdec=no
--disable-gil

build_ubuntu_ssltests:
name: 'Ubuntu SSL tests with OpenSSL'
Expand DownExpand Up@@ -373,8 +371,7 @@ jobs:
../cpython-ro-srcdir/configure \
--config-cache \
--with-pydebug \
--with-openssl=$OPENSSL_DIR \
--with-system-libmpdec=no
--with-openssl=$OPENSSL_DIR
- name: Build CPython out-of-tree
working-directory: ${{ env.CPYTHON_BUILDDIR }}
run: make -j4
Expand DownExpand Up@@ -480,7 +477,7 @@ jobs:
save: ${{ github.event_name == 'push' }}
max-size: "200M"
- name: Configure CPython
run: ./configure --config-cache --with-address-sanitizer --without-pymalloc --with-system-libmpdec=no
run: ./configure --config-cache --with-address-sanitizer --without-pymalloc
- name: Build CPython
run: make -j4
- name: Display build info
Expand Down
1 change: 1 addition & 0 deletions.github/workflows/posix-deps-apt.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ apt-get -yq install \
libgdbm-dev \
libgdbm-compat-dev \
liblzma-dev \
libmpdec-dev \
Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

@hugovk: FYI, this will fail for Ubuntu 24.04, aslibmpdec-dev is unavailable there.

hugovk reacted with thumbs up emoji
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I've been trying to figure outwhy that is, and have come up short (I get lost quickly in the Debian/Ubuntu development process). All I've found is a note from@doko42 in the Ubuntupython3.11 3.11.2-4 changelog, saying "Build with internal mpdecimal library, so that mpdecimal can be removed for bookworm." (and indeed, Debian bookworm does not have a libmpdec package either).

erlend-aasland reacted with eyes emoji
Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

MtkN1 reacted with thumbs up emoji
libncurses5-dev \
libreadline6-dev \
libsqlite3-dev \
Expand Down
78 changes: 22 additions & 56 deletionsconfigure
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

16 changes: 12 additions & 4 deletionsconfigure.ac
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3983,7 +3983,7 @@ AC_MSG_RESULT([$with_system_libmpdec])
AS_VAR_IF(
[with_system_libmpdec], [yes],
[PKG_CHECK_MODULES(
[LIBMPDEC], [libmpdec], [],
[LIBMPDEC], [libmpdec >= 2.5.0], [],
[LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""}
LIBMPDEC_LIBS=${LIBMPDEC_LIBS-"-lmpdec -lm"}
LIBMPDEC_INTERNAL=])],
Expand All@@ -3995,9 +3995,17 @@ AS_VAR_IF([with_system_libmpdec], [yes],
[WITH_SAVE_ENV([
CPPFLAGS="$LIBMPDEC_CFLAGS $CPPFLAGS"
LDFLAGS="$LIBMPDEC_LIBS $LDFLAGS"
AC_SEARCH_LIBS(
[mpd_version], [mpdec],
[have_mpdec=yes], [have_mpdec=no])])],

AC_LINK_IFELSE([
AC_LANG_PROGRAM([
#include <mpdecimal.h>
#if MPD_VERSION_HEX < 0x02050000
# error "mpdecimal 2.5.0 or higher required"
#endif
], [void *x = mpd_version;])],
[have_mpdec=yes],
[have_mpdec=no])
])],
[AS_VAR_SET([have_mpdec], [yes])
AC_MSG_WARN([m4_normalize([
the bundled copy of libmpdecimal is scheduled for removal in Python 3.15;
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp