Skip to content

Commit 0ecedff

Browse files
indygregindygreg
committed
unix: rename libffi -> libffi-3.3
In preparation for introducing libffi 3.4.
1 parent 95c1fc0 commit 0ecedff

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎cpython-unix/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ $(OUTDIR)/inputproto-$(INPUTPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_D
117117
$(OUTDIR)/kbproto-$(KBPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-kbproto.sh
118118
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) kbproto
119119

120-
$(OUTDIR)/libffi-$(LIBFFI_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-libffi.sh
121-
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) libffi
120+
$(OUTDIR)/libffi-3.3-$(LIBFFI_3.3_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-libffi-3.3.sh
121+
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) libffi-3.3
122122

123123
$(OUTDIR)/libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-libpthread-stubs.sh $(OUTDIR)/image-$(DOCKER_IMAGE_BUILD).tar
124124
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) libpthread-stubs
@@ -273,7 +273,7 @@ PYTHON_DEPENDS := \
273273
$(if $(NEED_BZIP2),$(OUTDIR)/bzip2-$(BZIP2_VERSION)-$(PACKAGE_SUFFIX).tar) \
274274
$(if $(NEED_EXPAT),$(OUTDIR)/expat-$(EXPAT_VERSION)-$(PACKAGE_SUFFIX).tar) \
275275
$(if $(NEED_LIBEDIT),$(OUTDIR)/libedit-$(LIBEDIT_VERSION)-$(PACKAGE_SUFFIX).tar) \
276-
$(if $(NEED_LIBFFI),$(OUTDIR)/libffi-$(LIBFFI_VERSION)-$(PACKAGE_SUFFIX).tar) \
276+
$(if $(NEED_LIBFFI_3_3),$(OUTDIR)/libffi-3.3-$(LIBFFI_3.3_VERSION)-$(PACKAGE_SUFFIX).tar) \
277277
$(if $(NEED_m4),$(OUTDIR)/m4-$(M4_VERSION)-$(PACKAGE_SUFFIX).tar) \
278278
$(if $(NEED_MPDECIMAL),$(OUTDIR)/mpdecimal-$(MPDECIMAL_VERSION)-$(PACKAGE_SUFFIX).tar) \
279279
$(if $(NEED_NCURSES),$(OUTDIR)/ncurses-$(NCURSES_VERSION)-$(PACKAGE_SUFFIX).tar) \

‎cpython-unix/build-libffi.sh renamed to ‎cpython-unix/build-libffi-3.3.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ ROOT=`pwd`
99

1010
export PATH=${TOOLS_PATH}/${TOOLCHAIN}/bin:${TOOLS_PATH}/host/bin:$PATH
1111

12-
tar -xf libffi-${LIBFFI_VERSION}.tar.gz
12+
tar -xf libffi-${LIBFFI_3_3_VERSION}.tar.gz
1313

14-
pushd libffi-${LIBFFI_VERSION}
14+
pushd libffi-${LIBFFI_3_3_VERSION}
1515

1616
EXTRA_CONFIGURE=
1717

‎cpython-unix/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ def main():
10221022
"expat",
10231023
"inputproto",
10241024
"kbproto",
1025-
"libffi",
1025+
"libffi-3.3",
10261026
"libpthread-stubs",
10271027
"m4",
10281028
"mpdecimal",

‎cpython-unix/targets.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ aarch64-apple-darwin:
9292
- autoconf
9393
- bzip2
9494
- expat
95-
- libffi
95+
- libffi-3.3
9696
- m4
9797
- mpdecimal
9898
- openssl-3.0
@@ -136,7 +136,7 @@ aarch64-apple-ios:
136136
- autoconf
137137
- bzip2
138138
- expat
139-
- libffi
139+
- libffi-3.3
140140
- m4
141141
- mpdecimal
142142
- openssl-3.0
@@ -164,7 +164,7 @@ aarch64-unknown-linux-gnu:
164164
- bzip2
165165
- expat
166166
- libedit
167-
- libffi
167+
- libffi-3.3
168168
- libX11
169169
- libXau
170170
- libxcb
@@ -242,7 +242,7 @@ armv7-unknown-linux-gnueabi:
242242
- bzip2
243243
- expat
244244
- libedit
245-
- libffi
245+
- libffi-3.3
246246
- libX11
247247
- libXau
248248
- libxcb
@@ -280,7 +280,7 @@ armv7-unknown-linux-gnueabihf:
280280
- bzip2
281281
- expat
282282
- libedit
283-
- libffi
283+
- libffi-3.3
284284
- libX11
285285
- libXau
286286
- libxcb
@@ -324,7 +324,7 @@ i686-unknown-linux-gnu:
324324
- bzip2
325325
- expat
326326
- libedit
327-
- libffi
327+
- libffi-3.3
328328
- libX11
329329
- libXau
330330
- libxcb
@@ -362,7 +362,7 @@ mips-unknown-linux-gnu:
362362
- bzip2
363363
- expat
364364
- libedit
365-
- libffi
365+
- libffi-3.3
366366
- libX11
367367
- libXau
368368
- libxcb
@@ -400,7 +400,7 @@ mipsel-unknown-linux-gnu:
400400
- bzip2
401401
- expat
402402
- libedit
403-
- libffi
403+
- libffi-3.3
404404
- libX11
405405
- libXau
406406
- libxcb
@@ -438,7 +438,7 @@ ppc64le-unknown-linux-gnu:
438438
- bzip2
439439
- expat
440440
- libedit
441-
- libffi
441+
- libffi-3.3
442442
- libX11
443443
- libXau
444444
- libxcb
@@ -476,7 +476,7 @@ s390x-unknown-linux-gnu:
476476
- bzip2
477477
- expat
478478
- libedit
479-
- libffi
479+
- libffi-3.3
480480
- libX11
481481
- libXau
482482
- libxcb
@@ -576,7 +576,7 @@ x86_64-apple-darwin:
576576
- autoconf
577577
- bzip2
578578
- expat
579-
- libffi
579+
- libffi-3.3
580580
- m4
581581
- mpdecimal
582582
- openssl-3.0
@@ -620,7 +620,7 @@ x86_64-apple-ios:
620620
- autoconf
621621
- bzip2
622622
- expat
623-
- libffi
623+
- libffi-3.3
624624
- m4
625625
- mpdecimal
626626
- openssl-3.0
@@ -732,7 +732,7 @@ x86_64-unknown-linux-gnu:
732732
- bzip2
733733
- expat
734734
- libedit
735-
- libffi
735+
- libffi-3.3
736736
- libX11
737737
- libXau
738738
- libxcb
@@ -777,7 +777,7 @@ x86_64_v2-unknown-linux-gnu:
777777
- bzip2
778778
- expat
779779
- libedit
780-
- libffi
780+
- libffi-3.3
781781
- libX11
782782
- libXau
783783
- libxcb
@@ -822,7 +822,7 @@ x86_64_v3-unknown-linux-gnu:
822822
- bzip2
823823
- expat
824824
- libedit
825-
- libffi
825+
- libffi-3.3
826826
- libX11
827827
- libXau
828828
- libxcb
@@ -867,7 +867,7 @@ x86_64_v4-unknown-linux-gnu:
867867
- bzip2
868868
- expat
869869
- libedit
870-
- libffi
870+
- libffi-3.3
871871
- libX11
872872
- libXau
873873
- libxcb
@@ -909,7 +909,7 @@ x86_64-unknown-linux-musl:
909909
- bzip2
910910
- expat
911911
- libedit
912-
- libffi
912+
- libffi-3.3
913913
- libX11
914914
- libXau
915915
- libxcb
@@ -952,7 +952,7 @@ x86_64_v2-unknown-linux-musl:
952952
- bzip2
953953
- expat
954954
- libedit
955-
- libffi
955+
- libffi-3.3
956956
- libX11
957957
- libXau
958958
- libxcb
@@ -995,7 +995,7 @@ x86_64_v3-unknown-linux-musl:
995995
- bzip2
996996
- expat
997997
- libedit
998-
- libffi
998+
- libffi-3.3
999999
- libX11
10001000
- libXau
10011001
- libxcb
@@ -1038,7 +1038,7 @@ x86_64_v4-unknown-linux-musl:
10381038
- bzip2
10391039
- expat
10401040
- libedit
1041-
- libffi
1041+
- libffi-3.3
10421042
- libX11
10431043
- libXau
10441044
- libxcb

‎pythonbuild/downloads.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"license_file": "LICENSE.libedit.txt",
118118
},
119119
# libffi 3.4 has trouble building with musl due to Linux headers wonkiness.
120-
"libffi": {
120+
"libffi-3.3": {
121121
"url": "https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz",
122122
"size": 1305466,
123123
"sha256": "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056",

0 commit comments

Comments
 (0)