From: Peter Michael Green Date: Mon, 25 Nov 2019 01:16:28 +0000 (+0000) Subject: Manual merge of version 4.05.0-12+rpi1 and 4.08.1-4 to produce 4.08.1-4+rpi1 X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d4ee53f4051d7be783e37d2b5109b87169db4194;p=ocaml.git Manual merge of version 4.05.0-12+rpi1 and 4.08.1-4 to produce 4.08.1-4+rpi1 --- d4ee53f4051d7be783e37d2b5109b87169db4194 diff --cc debian/changelog index 84e04dd6,e4900459..1384848a --- a/debian/changelog +++ b/debian/changelog @@@ -1,6 -1,76 +1,84 @@@ - ocaml (4.05.0-12+rpi1) bullseye-staging; urgency=medium ++ocaml (4.08.1-4+rpi1) bullseye-staging; urgency=medium + - -- Raspbian forward porter Sun, 18 Aug 2019 11:58:49 +0000 ++ [changes brought forward from 4.01.0-5+rpi1 by Peter Michael Green at Sat, 24 Jan 2015 10:29:46 +0000] ++ * Add logic in debian/rules to detect raspbian and give the upstream ++ configure script the correct instructions. ++ ++ -- Peter Michael Green Mon, 25 Nov 2019 01:15:30 +0000 ++ + ocaml (4.08.1-4) unstable; urgency=medium + + * ocaml-base-nox Breaks/Replaces also ocaml-nox (Closes: #944126) + * Install seq compatibility package + + -- Stéphane Glondu Fri, 08 Nov 2019 11:43:37 +0100 + + ocaml (4.08.1-3) unstable; urgency=medium + + * Do no longer install ocaml-native-compilers.conf (should fix FTBFS of + many reverse dependencies) + * Add relationship for ocaml-nox overwriting ocaml-base-nox (Closes: + #944126) + + -- Stéphane Glondu Wed, 06 Nov 2019 11:12:49 +0100 + + ocaml (4.08.1-2) unstable; urgency=medium + + * Upload to unstable + * Disable failing tests on hurd + + -- Stéphane Glondu Mon, 04 Nov 2019 13:43:40 +0100 + + ocaml (4.08.1-1) experimental; urgency=medium + + * New upstream release + * Statically link -lbfd to avoid a tight dependency with libbinutils + * Put VERSION in ocaml-base-nox + * Add Breaks/Replaces: ocaml-base to ocaml-base-nox (Closes: #933792) + * Disable testpreempt test on kfreebsd for now + * Add back Debian-specific -custom behaviour + + -- Stéphane Glondu Mon, 30 Sep 2019 16:40:45 +0200 + + ocaml (4.08.0-3) experimental; urgency=medium + + * Disable native compiler on powerpc and x32 + * Tune testpreempt test to make it work on kfreebsd + + -- Stéphane Glondu Tue, 30 Jul 2019 13:27:15 +0200 + + ocaml (4.08.0-2) experimental; urgency=medium + + * Build with BUILD_PATH_PREFIX_MAP set, to improve reproducibility + * Use CCLINKFLAGS for linking all executables and shared libraries, to + pass hardening flags + * Properly disable almabench test on slow architectures (should fix + FTBFS on them) + * Check for definition of AT_SECURE before using it (should fix FTBFS on + kfreebsd-*) + * Add x32 to native architecture (should fix FTBFS) + * Add support for Debian's armhf in configure.ac (should fix FTBFS) + * Add more Lintian overrides + * Fix spelling errors reported by Lintian + * Bump Standards-Version to 4.4.0 + * Remove Samuel from Uploaders + + -- Stéphane Glondu Wed, 24 Jul 2019 10:53:51 +0200 + + ocaml (4.08.0-1) experimental; urgency=medium + + [ Stéphane Glondu ] + * New upstream release + - many Debian-specific patches have been dropped + - drop ocaml-mode binary package + - add ocaml-man binary package + - update debian/copyright + * Bump debhelper compat to 12 + + [ Nicolas Boulenguez ] + * Fix broken doc symlinks (Closes: #877267) + + -- Stéphane Glondu Thu, 11 Jul 2019 14:19:49 +0200 ocaml (4.05.0-12) unstable; urgency=medium diff --cc debian/rules index 95321437,6a862c50..dac5761e --- a/debian/rules +++ b/debian/rules @@@ -53,22 -53,11 +53,22 @@@ export OCAML_STDLIB_DI export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow export CCLINKFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -CONFIGURE_OPTS := \ - --host $(DEB_BUILD_GNU_TYPE)\ +ifeq ($(DEB_BUILD_ARCH),armhf) + IS_RASPBIAN := $(shell dpkg-vendor --derives-from Raspbian && echo yes || echo no) +else + IS_RASPBIAN := no +endif + +ifeq ($(IS_RASPBIAN),yes) + CONFIGURE_OPTS := --host armv6-unknown-linux-gnueabihf +else + CONFIGURE_OPTS := --host $(DEB_BUILD_GNU_TYPE) +endif + +CONFIGURE_OPTS += \ - --with-pthread -prefix $(DEB_TEST_BUILD_PREFIX)/usr \ + -prefix $(DEB_TEST_BUILD_PREFIX)/usr \ -libdir $(DEB_TEST_BUILD_PREFIX)$(OCAML_STDLIB_DIR) \ - -x11lib "$(shell pkg-config --variable=libdir x11)" \ + --with-x \ -mandir $(DEB_TEST_BUILD_PREFIX)/usr/share/man \ CONFIGURE_SED := \ diff --cc tools/ci/appveyor/appveyor_build.cmd index 00000000,bed57e6f..9f0ebc97 mode 000000,100644..100644 --- a/tools/ci/appveyor/appveyor_build.cmd +++ b/tools/ci/appveyor/appveyor_build.cmd @@@ -1,0 -1,112 +1,112 @@@ -@rem *********************************************************************** -@rem * * -@rem * OCaml * -@rem * * -@rem * David Allsopp, OCaml Labs, Cambridge. * -@rem * * -@rem * Copyright 2017 MetaStack Solutions Ltd. * -@rem * * -@rem * All rights reserved. This file is distributed under the terms of * -@rem * the GNU Lesser General Public License version 2.1, with the * -@rem * special exception on linking described in the file LICENSE. * -@rem * * -@rem *********************************************************************** - -@rem BE CAREFUL ALTERING THIS FILE TO ENSURE THAT ERRORS PROPAGATE -@rem IF A COMMAND SHOULD FAIL IT PROBABLY NEEDS TO END WITH -@rem || exit /b 1 -@rem BASICALLY, DO THE TESTING IN BASH... - -@rem Do not call setlocal! -@echo off - -goto %1 - -goto :EOF - -:CheckPackage -"%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %1" | findstr %1 > nul -if %ERRORLEVEL% equ 1 ( - echo Cygwin package %1 will be installed - set CYGWIN_INSTALL_PACKAGES=%CYGWIN_INSTALL_PACKAGES%,%1 -) -goto :EOF - -:UpgradeCygwin -if "%CYGWIN_INSTALL_PACKAGES%" neq "" "%CYG_ROOT%\setup-x86_64.exe" --quiet-mode --no-shortcuts --no-startmenu --no-desktop --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages %CYGWIN_INSTALL_PACKAGES:~1% > nul -for %%P in (%CYGWIN_COMMANDS%) do "%CYG_ROOT%\bin\%%P.exe" --version > nul || set CYGWIN_UPGRADE_REQUIRED=1 -"%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %CYGWIN_PACKAGES%" -if %CYGWIN_UPGRADE_REQUIRED% equ 1 ( - echo Cygwin package upgrade required - please go and drink coffee - "%CYG_ROOT%\setup-x86_64.exe" --quiet-mode --no-shortcuts --no-startmenu --no-desktop --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --upgrade-also > nul - "%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %CYGWIN_PACKAGES%" -) -goto :EOF - -:install -chcp 65001 > nul -rem This must be kept in sync with appveyor_build.sh -set BUILD_PREFIX=🐫реализация -git worktree add "..\%BUILD_PREFIX%-%PORT%" -b appveyor-build-%PORT% -if "%PORT%" equ "msvc64" ( - git worktree add "..\%BUILD_PREFIX%-msvc32" -b appveyor-build-%PORT%32 -) - -cd "..\%BUILD_PREFIX%-%PORT%" -if "%PORT%" equ "mingw32" ( - git submodule update --init flexdll -) - -cd "%APPVEYOR_BUILD_FOLDER%" -appveyor DownloadFile "https://github.com/alainfrisch/flexdll/archive/0.37.tar.gz" -FileName "flexdll.tar.gz" || exit /b 1 -appveyor DownloadFile "https://github.com/alainfrisch/flexdll/releases/download/0.37/flexdll-bin-0.37.zip" -FileName "flexdll.zip" || exit /b 1 -rem flexdll.zip is processed here, rather than in appveyor_build.sh because the -rem unzip command comes from MSYS2 (via Git for Windows) and it has to be -rem invoked via cmd /c in a bash script which is weird(er). -mkdir "%APPVEYOR_BUILD_FOLDER%\..\flexdll" -move flexdll.zip "%APPVEYOR_BUILD_FOLDER%\..\flexdll" -cd "%APPVEYOR_BUILD_FOLDER%\..\flexdll" && unzip -q flexdll.zip - -rem CYGWIN_PACKAGES is the list of required Cygwin packages (cygwin is included -rem in the list just so that the Cygwin version is always displayed on the log). -rem CYGWIN_COMMANDS is a corresponding command to run with --version to test -rem whether the package works. This is used to verify whether the installation -rem needs upgrading. -set CYGWIN_PACKAGES=cygwin make diffutils -set CYGWIN_COMMANDS=cygcheck make diff -if "%PORT%" equ "mingw32" ( - set CYGWIN_PACKAGES=%CYGWIN_PACKAGES% mingw64-i686-gcc-core - set CYGWIN_COMMANDS=%CYGWIN_COMMANDS% i686-w64-mingw32-gcc -) - -set CYGWIN_INSTALL_PACKAGES= -set CYGWIN_UPGRADE_REQUIRED=0 - -for %%P in (%CYGWIN_PACKAGES%) do call :CheckPackage %%P -call :UpgradeCygwin - -"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh install" || exit /b 1 - -goto :EOF - -:build -if "%PORT%" equ "msvc64" ( - setlocal - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat" -) -rem Do the main build (either msvc64 or mingw32) -"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh" || exit /b 1 - -if "%PORT%" neq "msvc64" goto :EOF - -rem Reconfigure the environment and run the msvc32 partial build -endlocal -call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 -"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh msvc32-only" || exit /b 1 -goto :EOF - -:test -rem Reconfigure the environment for the msvc64 build -call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat" -"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh test" || exit /b 1 -goto :EOF ++@rem *********************************************************************** ++@rem * * ++@rem * OCaml * ++@rem * * ++@rem * David Allsopp, OCaml Labs, Cambridge. * ++@rem * * ++@rem * Copyright 2017 MetaStack Solutions Ltd. * ++@rem * * ++@rem * All rights reserved. This file is distributed under the terms of * ++@rem * the GNU Lesser General Public License version 2.1, with the * ++@rem * special exception on linking described in the file LICENSE. * ++@rem * * ++@rem *********************************************************************** ++ ++@rem BE CAREFUL ALTERING THIS FILE TO ENSURE THAT ERRORS PROPAGATE ++@rem IF A COMMAND SHOULD FAIL IT PROBABLY NEEDS TO END WITH ++@rem || exit /b 1 ++@rem BASICALLY, DO THE TESTING IN BASH... ++ ++@rem Do not call setlocal! ++@echo off ++ ++goto %1 ++ ++goto :EOF ++ ++:CheckPackage ++"%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %1" | findstr %1 > nul ++if %ERRORLEVEL% equ 1 ( ++ echo Cygwin package %1 will be installed ++ set CYGWIN_INSTALL_PACKAGES=%CYGWIN_INSTALL_PACKAGES%,%1 ++) ++goto :EOF ++ ++:UpgradeCygwin ++if "%CYGWIN_INSTALL_PACKAGES%" neq "" "%CYG_ROOT%\setup-x86_64.exe" --quiet-mode --no-shortcuts --no-startmenu --no-desktop --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages %CYGWIN_INSTALL_PACKAGES:~1% > nul ++for %%P in (%CYGWIN_COMMANDS%) do "%CYG_ROOT%\bin\%%P.exe" --version > nul || set CYGWIN_UPGRADE_REQUIRED=1 ++"%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %CYGWIN_PACKAGES%" ++if %CYGWIN_UPGRADE_REQUIRED% equ 1 ( ++ echo Cygwin package upgrade required - please go and drink coffee ++ "%CYG_ROOT%\setup-x86_64.exe" --quiet-mode --no-shortcuts --no-startmenu --no-desktop --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --upgrade-also > nul ++ "%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %CYGWIN_PACKAGES%" ++) ++goto :EOF ++ ++:install ++chcp 65001 > nul ++rem This must be kept in sync with appveyor_build.sh ++set BUILD_PREFIX=🐫реализация ++git worktree add "..\%BUILD_PREFIX%-%PORT%" -b appveyor-build-%PORT% ++if "%PORT%" equ "msvc64" ( ++ git worktree add "..\%BUILD_PREFIX%-msvc32" -b appveyor-build-%PORT%32 ++) ++ ++cd "..\%BUILD_PREFIX%-%PORT%" ++if "%PORT%" equ "mingw32" ( ++ git submodule update --init flexdll ++) ++ ++cd "%APPVEYOR_BUILD_FOLDER%" ++appveyor DownloadFile "https://github.com/alainfrisch/flexdll/archive/0.37.tar.gz" -FileName "flexdll.tar.gz" || exit /b 1 ++appveyor DownloadFile "https://github.com/alainfrisch/flexdll/releases/download/0.37/flexdll-bin-0.37.zip" -FileName "flexdll.zip" || exit /b 1 ++rem flexdll.zip is processed here, rather than in appveyor_build.sh because the ++rem unzip command comes from MSYS2 (via Git for Windows) and it has to be ++rem invoked via cmd /c in a bash script which is weird(er). ++mkdir "%APPVEYOR_BUILD_FOLDER%\..\flexdll" ++move flexdll.zip "%APPVEYOR_BUILD_FOLDER%\..\flexdll" ++cd "%APPVEYOR_BUILD_FOLDER%\..\flexdll" && unzip -q flexdll.zip ++ ++rem CYGWIN_PACKAGES is the list of required Cygwin packages (cygwin is included ++rem in the list just so that the Cygwin version is always displayed on the log). ++rem CYGWIN_COMMANDS is a corresponding command to run with --version to test ++rem whether the package works. This is used to verify whether the installation ++rem needs upgrading. ++set CYGWIN_PACKAGES=cygwin make diffutils ++set CYGWIN_COMMANDS=cygcheck make diff ++if "%PORT%" equ "mingw32" ( ++ set CYGWIN_PACKAGES=%CYGWIN_PACKAGES% mingw64-i686-gcc-core ++ set CYGWIN_COMMANDS=%CYGWIN_COMMANDS% i686-w64-mingw32-gcc ++) ++ ++set CYGWIN_INSTALL_PACKAGES= ++set CYGWIN_UPGRADE_REQUIRED=0 ++ ++for %%P in (%CYGWIN_PACKAGES%) do call :CheckPackage %%P ++call :UpgradeCygwin ++ ++"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh install" || exit /b 1 ++ ++goto :EOF ++ ++:build ++if "%PORT%" equ "msvc64" ( ++ setlocal ++ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat" ++) ++rem Do the main build (either msvc64 or mingw32) ++"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh" || exit /b 1 ++ ++if "%PORT%" neq "msvc64" goto :EOF ++ ++rem Reconfigure the environment and run the msvc32 partial build ++endlocal ++call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 ++"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh msvc32-only" || exit /b 1 ++goto :EOF ++ ++:test ++rem Reconfigure the environment for the msvc64 build ++call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat" ++"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh test" || exit /b 1 ++goto :EOF