Mercurial > mxe-octave

changeset 5829:f61f106184dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add package build-libffi (bug #61024). * src/build-libffi.mk: Add new file. * index.html, dist-files.mk: Add new package and file to lists. * src/build-libffi.mk: Use new package.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 10 Aug 2021 09:59:40 +0200
parents 7fdde32747cf
children 5cb9ea0261ba
files dist-files.mk index.html src/build-libffi.mk src/build-python3.mk
diffstat 4 files changed, 53 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Mon Aug 09 23:20:17 2021 +0200
+++ b/dist-files.mk	Tue Aug 10 09:59:40 2021 +0200
@@ -31,6 +31,7 @@
   build-gcc.mk \
   build-gettext.mk \
   build-gperf.mk \
+  build-libffi.mk \
   build-libtool.mk \
   build-lzip.mk \
   build-m4.mk \
--- a/index.html	Mon Aug 09 23:20:17 2021 +0200
+++ b/index.html	Tue Aug 10 09:59:40 2021 +0200
@@ -1018,6 +1018,10 @@
         <td class="website"><a href="http://www.gnu.org/software/gperf">gperf</a></td>
     </tr>
     <tr>
+        <td class="package">build-libffi</td>
+        <td class="website"><a href="http://sourceware.org/libffi/">libffi</a></td>
+    </tr>
+    <tr>
         <td class="package">build-libtool</td>
         <td class="website"><a href="http://www.gnu.org/software/libtool">libtool</a></td>
     </tr>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/build-libffi.mk	Tue Aug 10 09:59:40 2021 +0200
@@ -0,0 +1,34 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+_PKG            := libffi
+PKG             := build-$(_PKG)
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.4.2
+$(PKG)_CHECKSUM := f5fbf0e8b643c4029a069faca32dd0df2c7dd0a2
+$(PKG)_SUBDIR   := $(_PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(_PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://github.com/$(_PKG)/$(_PKG)/archive/refs/tags/v$($(PKG)_VERSION).tar.gz
+$(PKG)_DEPS     :=
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://github.com/libffi/libffi/tags' | \
+    $(SED) -n 's,.*releases/tag/v\([0-9][^"]*\).*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+  cd '$(1)' && \
+    ./autogen.sh && \
+    ./configure \
+      --prefix='$(BUILD_TOOLS_PREFIX)' \
+      $(ENABLE_SHARED_OR_STATIC)
+
+  $(MAKE) -C '$(1)' -j '$(JOBS)'
+  $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)' 
+
+  if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \
+    rm -rf "$(3)$(BUILD_TOOLS_PREFIX)/share"; \
+  fi
+
+endef
--- a/src/build-python3.mk	Mon Aug 09 23:20:17 2021 +0200
+++ b/src/build-python3.mk	Tue Aug 10 09:59:40 2021 +0200
@@ -8,20 +8,25 @@
 $(PKG)_SUBDIR   := Python-$($(PKG)_VERSION)
 $(PKG)_FILE     := Python-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://www.python.org/ftp/python/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := libffi
+$(PKG)_DEPS     := build-libffi
 ifneq ($(USE_SYSTEM_GCC),yes)
-    $(PKG)_DEPS     += build-gcc
+  $(PKG)_DEPS     += build-gcc
 endif
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+  echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+  echo $($(PKG)_VERSION)
 endef
 
 define $(PKG)_BUILD
-    mkdir '$(1)/.build'
-    cd    '$(1)/.build' && '$(1)/configure' \
-        --prefix='$(BUILD_TOOLS_PREFIX)'
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
-    $(MAKE) -C '$(1)/.build' -j 1 install
+  mkdir '$(1)/.build'
+  cd '$(1)/.build' && \
+    PKG_CONFIG_PATH='$(BUILD_PKG_CONFIG_PATH)' \
+    LD_LIBRARY_PATH='$(LD_LIBRARY_PATH)' \
+    '$(1)/configure' \
+      --prefix='$(BUILD_TOOLS_PREFIX)' \
+     
+        
+  $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
+  $(MAKE) -C '$(1)/.build' -j 1 install
 endef