summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormanu <manu@pkgsrc.org>2020-04-16 09:21:51 +0000
committermanu <manu@pkgsrc.org>2020-04-16 09:21:51 +0000
commit6268059d25dcbd36f43cfb1dfe479358a3084d0c (patch)
tree0b562abc0f7d84eb2f7e3770b981ffaa16556003
parent6df1d5408ce2eab4a16201c23414c4b7631e1e40 (diff)
downloadpkgsrc-6268059d25dcbd36f43cfb1dfe479358a3084d0c.tar.gz
Update gnustep-make to 2.8.0
This is required to restore the build of gnustep-objc and gnustep-base on NetBSD 9.0 Change since previous version in pkgsrc 2020-04-05 Ivan Vucica <ivan@vucica.net> * ANNOUNCE: * NEWS: * RELEASENOTES: * Documentation/news.texi: * Documentation/releasenotes.texi: Update release notes for 2.8.0. * Version: Bump version to 2.8.0. 2020-02-28 Patryk Laurent <plaurent@me.com> * target.make: Unified cross-OS class name extraction and unified for other OSes (Darwin, OpenBSD, MinGW). 2020-02-22 Patryk Laurent <plaurent@me.com> * target.make: Improved detection of runtime version. Fixed class name extraction for Darwin, OpenBSD and MinGW32/64. 2020-02-18 Patryk Laurent <plaurent@me.com> * target.make: Fixed EXTRACT_CLASS_NAMES_COMMAND for runtime v2. 2020-02-17 Richard Frith-Macdonald <rfm@gnu.org> * library-combo.make: removed GS_WITH_ARC support * rules.make: added GS_WITH_ARC stuff * Documentation/gnustep-make.texi: Document the changes ... We can define GS_WITH_ARC more freely (it is no longer necessary to define it before common.make). The default compiler flags for ARC support now include -fobjc-arc-exceptions. We can now define ARC_CPPFLAGS and ARC_OBJCFLAGS to overide the flags sent to the preprocessor and compiler/linker when ARC is enabled using GS_WITH_ARC 2019-10-29 Wolfgang Lux <wolfgang.lux@gmail.com> * GNUmakefile.in: * Master/source-distribution.make: Add support for creating Mercurial tags and creating tarballs from a Mercurial tag. 2018-07-10 Richard Frith-Macdonald <rfm@gnu.org> * config.make.in: * configure: * configure.ac: * library-combo.make: * target.make: Change to use -fobjc-runtime=gcc when building with clang but targetting the gnu/gcc runtime ABI. Suggested by David as the correct way to tell clang what runtime it should be targetting. 2018-07-09 Richard Frith-Macdonald <rfm@gnu.org> * Documentation/library-combo.7: * common.make: * config.make.in: * configure: * configure.ac: * library-combo.make: Changes removing nonfragile ABI settings I made over a year ago and somehow failed to commit. With the ng runtime we always use the nonfragile ABI (since it's required for ARC). With the gnu runtime we don't have it and can't use it. Anything else is for experts (and if we want to make that easier it's better done in gnustep-base). 2018-07-05 Wolfgang Lux <wolfgang.lux@gmail.com> * Instance/framework.make: * Instance/library.make: Fix quotation errors in automatically generated testsuite flags. 2018-03-22 Richard Frith-Macdonald <rfm@gnu.org> * TestFramework/gnustep-tests.in: When invoked with --verbose it would be nice to build testscases using messages=yes 2018-03-21 Richard Frith-Macdonald <rfm@gnu.org> * Instance/framework.make: * Instance/library.make: When automatically invoking testsuite for 'make check', pass additional linker flags to use -rpath so built testcases can be executed standalone and still use the locally built library/framework. Idea by David 2018-03-05 Riccardo Mottola <rm@gnu.org> * target.make Remove legacy Rhapsody and FreeBSD-out support 2018-03-05 Riccardo Mottola <rm@gnu.org> * target.make netbsd: cleanup old X11R6 directories and generally remove additional dirs 2017-12-10 Ivan Vucica <ivan@vucica.net> * Master/source-distribution.make * GNUmakefile.in: When adding an ANNOUNCE file to the annotated tag, added dependency on the passed ANNOUNCE file to ensure the temporary file which prepends 'Release x.yz' gets regenerated while tagging. 2017-12-07 Ivan Vucica <ivan@vucica.net> * Master/source-distribution.make: Allow creating a Git tag and creating a tarball from a git tag. * GNUmakefile.in: Allow creating a Git tag and creating a tarball from a Git tag, for releasing gnustep-make itself. 2017-04-14 Richard Frith-Macdonald <rfm@gnu.org> * Version: 2.7.0 release * Documentation/news.texi: 2.7.0 release * Documentation/releasenotes.texi: 2.7.0 release * ANNOUNCE: * INSTALL: * NEWS: * README: * RELEASENOTES: Regenerate documentation 2017-04-07 Richard Frith-Macdonald <rfm@gnu.org> * common.make: correct earlier change ... error pointed out by Galen Rhodes as bug #50751 2016-11-22 Doug Simons <doug.simons@testplant.com> * target.make: Fix EXTRACT_CLASS_NAMES_COMMAND for Mingw64. 2016-08-19 Giah de Barag <gdb@crelg.com> * common.make: filter out optimisation flags when in debug mode. 2016-07-10 13:33-EDT Gregory John Casamento <greg.casamento@gmail.com> * GNUmakefile.in: add pkgconfig.make to INSTANCE_SHARED_MAKE_FILES variable so it is copied properly. 2016-07-08 Niels Grewe <niels.grewe@halbordnung.de> * GNUstep.conf.in * GNUstep.csh.in * GNUstep.sh.in * Instance/Shared/pkgconfig.make * Instance/framework.make * Instance/library.make * config-noarch.make.in * configure * configure.ac * messages.make Preliminary support for pkg-config files. The GNUstep.sh scripts set the PKG_CONFIG_PATH and $(INSTANCE)_PKGCONFIG_FILES can be used to specify the files to install. 2016-06-29 Niels Grewe <niels.grewe@halbordnung.de> * Instance/framework.make: Fix installation of Resources symlinks. 2016-06-25 Richard Frith-Macdonald <rfm@gnu.org> * Documentation/releasenotes.texi: * GNUmakefile.in: * GNUstep.csh.in: * GNUstep.sh.in: * Master/rules.make: * common.make: * config-noarch.make.in: * gnustep-config.in: * openapp.in: * opentool.in: * rules.make: When building non-flattened, the subdirectory name for libraries/binaries is changed for Debian compatibility (and simplicity) to use a directory whose name is of the form architecture/library-combo rather than nested directories of the form cpu/os-abi/library-combo. The architecture name format is a sanitised triplet cpu-os-abi (where previously we had cpu/os-abi). When building non-flattened, header files are now installed in an architecture and library-combo dependent subdirectory in the same way that binary libraries are installed. This removes an inconsistency and makes sense with Debian multiarch support which puts headers in an architecture specific subdirectory. These changes are the first step in making GNUstep work seamlessly with Debian multiarch. To use them you will need to rebuild your entire gnustep installation, and in particular build a version of gnustep-base which has correspoinding changes to know where to look up resources at runtime. However, the changes should have no effect on a flattened installation (currently the default). 2016-05-19 Seong Gu Lee <sgleehd@gmail.com> * Instance/application.make: * config.guess: * config.sub: * jni.make: * rules.make: * target.make: mingw64 tweaks 2016-05-13 Richard Frith-Macdonald <rfm@gnu.org> * TestFramework/Summary.sh: * TestFramework/gnustep-tests.in: Avoid some pointless warnings when cleaning 2016-05-13 Yavor Doganov <yavor@gnu.org> * Instance/framework.make: Forgotten patch to allow multiple versions of a framework to be installed. * Documentation/GNUmakefile: * Instance/Documentation/texi.make: Forgotten patch to update for newere makeinfo which produces html. 2016-05-13 Richard Frith-Macdonald <rfm@gnu.org> * GNUmakefile.in: * TestFramework/gnustep-tests.in: * config.make.in: * common.make: * library-combo.make: * configure.ac: * configure: Minor tweaks... use ARC by default if ng runtime is specified 2016-03-25 Richard Frith-Macdonald <rfm@gnu.org> * common.make: * config.make.in: * configure.ac: * library-combo.make: * Documentation/library-combo.7: * TestFramework/Testing.h: * configure: Remove garbage collection support 2016-03-04 Richard Frith-Macdonald <rfm@gnu.org> * configure.ac: Enable strict v2 mode by default * configure: regenerate * README.Packaging: Warn about updating ancient makefiles * Documentation/library-combo.7: Talk about ng runtime * Version: * Documentation/news.texi: * Documentation/releasenotes.texi: Update prior to new release 2016-03-02 Richard Frith-Macdonald <rfm@gnu.org> * configure.ac: Improve selection of clang when 'ng' runtime library is selected. * configure: Regenerate. * library-combo.make: Add support for ARC with the 'ng' runtime setting. Enabled by defining GS_WITH_ARC=1 at the start of the GNUmakefile or in the environment or in the 'make' arguments. 2016-03-02 Niels Grewe <niels.grewe@halbordnung.de> * Master/documentation.make: Support skipping the documentation build if documentation=no is supplied * Documentation/gnustep-make.texi: Document the new documentation=no feature (and messages=yes, which as also missing). 2015-12-11 23:34-EST Gregory John Casamento <greg.casamento@gmail.com> * common.make: Mute error when trying to parse redhat-version file. 2015-11-26 Ivan Vucica <ivan@vucica.net> * ChangeLog: Fixed dates on some previous entries. * bake_debian_files: Fixed a typo: DEB_PRIORTY -> DEB_PRIORITY. 2015-10-26 Richard Frith-Macdonald <rfm@gnu.org> * TestFramework/gnustep-tests.in: Exit with status 1 if there are any test failures, 0 otherwise. 2015-10-24 Richard Frith-Macdonald <rfm@gnu.org> * Instance/framework.make: * Instance/library.make: * TestFramework/gnustep-tests.in: Improve automated library and framework testcase handling, with code to tell the testcases where to find the library/framework headers and what to link with in order to do the tests. 2015-10-21 Richard Frith-Macdonald <rfm@gnu.org> * Instance/framework.make: Remove unused methods (-frameworkEnv and -frameworkPath) from the dummy class. 2015-10-20 Richard Frith-Macdonald <rfm@gnu.org> * TestFramework/gnustep-tests.in: Deprecate Env.sh ... use TestInfo to set test ewnvironment * Instance/framework.make: Add rule to invoke gnustep-tests * Instance/library.make: Add rule to invoke gnustep-tests * Master/clibrary.make: pass 'make check' to instance * Master/framework.make: pass 'make check' to instance * Master/library.make: pass 'make check' to instance * Master/test-library.make: pass 'make check' to instance Simple minded initial attempt to make unit testing for libraries and frameworks easier by having a built-in rule to execute test files in a subdirectory specified using xxx_TEST_DIR 2015-09-23 Germán Arias <germanandre@gmx.es> * Documentation/README.MinGW: Fix errors in services path. 2015-08-17 Wolfgang Lux <wolfgang.lux@gmail.com> * configure.ac: Fix the previous change, which had broken the tests for Objective C++, the fragile API and native exception support, by using the correct autoconf macros. * configure: Regenerated. 2015-08-16 Richard Frith-Macdonald <rfm@gnu.org> * library-combo.make: Use David's suggested runtime flag for the next generation (ng) runtime combo. * configure.ac: Check for compiler blocks support for ng combo. Fix some program source quoting for newer autoconf 2015-08-08 Germán Arias <germanandre@gmx.es> * Documentation/README.MinGW: Add instructions to install aspell and to make a standalone directory to distribute apps. 2015-06-25 Niels Grewe <niels.grewe@halbordnung.de> * Instance/Shared/java.make: Fix escaping of inner classes when building jar files. 2015-06-09 Riccardo Mottola <rm@gnu.org> * config.make.in * configure.ac * target.make Check for nm and gnm as gnu nm, use a $(NM) variable instead of hard-coding the binary name of nm * configure Regerenated 2015-05-15 Richard Frith-Macdonald <rfm@gnu.org> * Documentation/news.texi: * Documentation/releasenotes.texi: * ANNOUNCE: * INSTALL: * NEWS: * RELEASENOTES: * Version: 2.6.7 bugfix/improvement release 2015-03-23 Richard Frith-Macdonald <rfm@gnu.org> * Instance/resource-set.make: Fix bug which could cause a resource dictionary to be installed inside an existing copy of the same resource dictionary. 2015-03-04 Germán Arias <germanandre@gmx.es> * Documentation/README.MinGW: Fix typos. 2015-02-21 Germán Arias <germanandre@gmx.es> * Documentation/README.MinGW: Add instructions to install cairo backend. 2015-02-19 Germán Arias <germanandre@gmx.es> * Documentation/README.MinGW: Update instructions for latest MinGW. 2015-01-19 Richard Frith-Macdonald <rfm@gnu.org> * TestFramework/gnustep-tests.in: Report abandoned files as failed. * TestFramework/Testing.h: Add timing of the duration of sets and a hook to perform additional reporting etc on set end. 2015-01-15 Richard Frith-Macdonald <rfm@gnu.org> * TestFramework/gnustep-tests.in: Check status of Start.sh script so we refrain from attempting tests in a directory whose startup script has failed. 2014-12-21: Niels Grewe <niels.grewe@halbordnung.de> * rules.make * Instance/Shared/java.make: Add as_jar option to install the jar file instead of the expanded class hierarchy. 2014-12-21: Niels Grewe <niels.grewe@halbordnung.de> * Instance/Shared/java.make * Instance/java.make * Instance/rules.make * Master/java.make * Master/rules.make * common.make * messages.make: Add a `jar' target to the java project type that allows jars to be built from all classes in the project. * Documentation/gnustep-make.texi: Document Java project variables. 2014-06-29 Nicolas Boulenguez <nicolas@debian.org> (tiny change) * common.make (INTERNAL_CFLAGS): Do not ignore user-specified CFLAGS. 2014-06-29 Yavor Doganov <yavor@gnu.org> * Documentation/GNUstep.7: * Documentation/debugapp.1: Typo fix. * Documentation/gnustep-tests.1: New. * GNUmakefile.in (install, uninstall): Handle gnustep-tests.1. 2014-06-07 Ivan Vucica <ivan@vucica.net> * Master/deb.make: Now adding gnustep-make dependency to the DEB_BUILD_DEPENDS only when creating _debenv file. 2014-05-11 Ivan Vucica <ivan@vucica.net> * GNUmakefile.in: Date-time and svn-revision suffix are now using the tilde character to ensure that the 'actual' commit and 'actual' tagged release are treated as being newer by the Debian packaging. Also stopped using periods in date-time. debfiles target will no longer be automatically run, allowing for build scripts to do some customization of debfiles inbetween, or to permit the packager maintain the debfiles separately. * Master/deb.make: Slightly cleaner build dependency line for gnustep-make. The version of gnustep-make we build-depend on is now read using dpkg -s. * Master/source-distribution.make: Date-time and svn-revision suffix are now using the tilde character to ensure that the 'actual' commit and 'actual' tagged release are treated as being newer by the Debian packaging. Also stopped using periods in date-time. 2014-05-06 Ivan Vucica <ivan@vucica.net> * bake_debian_files.sh: If DEB_DEPENDS is non-empty, prepend a comma. 2014-05-06 Ivan Vucica <ivan@vucica.net> * GNUmakefile.in: Tarball may now have the SVN revision and date appended to its version. This is done for svn-snapshot and svn-export targets to ensure we have a 'unique' .orig.tar.gz for uploading to the Launchpad PPA. The full name of the tarball will be saved in a text file usable by scripts. Tarball also has to be explicitly and separately produced and optionally specifying DEB_TARBALL_VERSION when building a Debian package. Debian control files now can (and need to) be separately built using the target debfiles. * Master/source-distribution.make: Similarly to how gnustep-make can export working copy as a tarball, the target svn-export has been added to other GNUmakefiles. Introduced TARBALL_VERSION as an overridable version string in the tarball name. Environment variables TARBALL_VERSION_INCLUDE_SVN_REVISION and TARBALL_VERSION_INCLUDE_DATE_TIME now allow expanding the tarball version with the svn revision and date+time. Instead of EXPORT_SVN_NAME, now specifying entire EXPORT_SVN_URL so that svn-export can specify '.'. * Master/deb.make: Switched to use of TARBALL_VERSION as the definitive version string in tarball name. Added debclean target. User now has to explicitly make a choice how the dist tarball will be produced. Depending on the method, tarball may be placed in the current or parent directory, so we detect that (and prefer the current directory). * bake_debian_files.sh: Now defaulting to target_arch=any so that the package gets built on all platforms when uploaded on Launchpad, instead of detecting an arch from gnustep-make and burning that arch into the source package. Added support for TARBALL_VERSION. Fixed a 'command not found' error. Added support for projects without autotools. 2014-05-05 Ivan Vucica <ivan@vucica.net> * GNUmakefile.in: Separately building source and binary package, optionally signing. Support for gnustep-make-ld.so.conf. * Master/deb.make: Tweaked procedure for building Debian packages to avoid cleaning when attempting to get 'make' variables that can be passed on to bake_debian_files.sh as environment variables. Signing packages is now optional, and source and binary packages are built separately. * bake_debian.files.sh: Improved .spec parsing. Introduced dependency on CDBS (which simplifies customizing of debian/rules) while automating some edge cases. Handling of DEB_VERSION_SUFFIX. * configure, configure.ac: Support for --enable-install-ld-so-conf. * gnustep-make-ld.so.conf.in: Template for the dynamic linker configuration file ld.so.conf/gnustep-make.conf. 2014-04-07 Ivan Vucica <ivan@vucica.net> * Master/deb.make, bake_debian_files.sh: Rewrite of .deb-building system that will produce both a source package and a binary package. Work in progress; currently only gnustep-make itself builds correctly. * GNUmakefile.in: Added the svn-export target which uses local files to do the equivalent of 'make dist'. Switched to new way of building .deb using bake_debian_files.sh. * deb-equivs-control.template: No longer necessary; removed. 2014-03-27 Richard Frith-Macdonald <rfm@gnu.org> * TestFramework/ObjectTesting.h: Add PASS_MATCH macro for matching against a regular expresssion. 2014-01-16 Richard Frith-Macdonald <rfm@gnu.org> * GNUmakefile.in: Fix a couple more hardcoded 'make' calls. * Instance/resource-set.make: * Instance/Shared/bundle.make: Try to get xxx_RESOURCE_DIR woreking consistently for all resources. 2014-01-12 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de> * config.make.in, GNUmakefile.in: Do not hardcode "make". It already gets detected via configure, so use the found name, especially on *BSD systems where its called gmake 2014-01-10 Richard Frith-Macdonald <rfm@gnu.org> * GNUmakefile.in: Implement Sebastian's suggestions for make targets to build/install documentation with or without gnustep-make as a convenience for packagers. * Documentation/GNUmakefile: Use uninstalled gnustep-make from enclosing directory if available ... based on idea by Niels and code/comments by Markus. 2014-01-06 Richard Frith-Macdonald <rfm@gnu.org> * Instance/Documentation/texi.make: Revert change from 2009-09-19 since texi2html now seems to be behaving as expected. However, attempt to move any html files from the subdirectory in case we are using a version which still puts them there. 2014-01-06 Richard Frith-Macdonald <rfm@gnu.org> * INSTALL: * Documentation/GNUmakefile: Make it clearer (ie very explicit) that you need to install gnustep-make in order to install documentation. 2013-12-25 Fred Kiefer <FredKiefer@gmx.de> * Instance/rules.make: Add detection for different forms of the Info.plist. * Instance/application.make, * Instance/bundle.make, * Instance/framework.make, * Instance/gswapp.make, * Instance/palette.make, * Instance/service.make: Use GNUSTEP_PLIST_DEPEND directly. 2013-12-25 Fred Kiefer <FredKiefer@gmx.de> * config.make.in: Use the correct CXX compiler. Fixes bug #36722. Patch by Johannes Lundberg <johannes@brilliantservice.co.jp>. 2013-12-24 Richard Frith-Macdonald <rfm@gnu.org> * Version: * Documentation/news.texi: * Documentation/releasenotes.texi: Make minor bugfix release ... Version 2.6.6 Update release notes/documentation 2013-12-12 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de> * Master/tool.make: on clean only delete the subdirectory that gets created when calling make. 2013-12-07 Wolfgang Lux <wolfgang.lux@gmail.com> * target.make: Add -keep_private_externs to linker flags on OS X when merging the object files of a subproject for compatibility with other platforms. 2013-12-06 Adam Fedor <fedor@gnu.org> * target.make: Add no-omit-framepointer on mingw32 2013-09-20 Ivan Vucica <ivan@vucica.net> * Master/deb.make: File enumeration now uses 'find'. Fixed problem where files outside 'Local' were being accidentally dropped from the package. Symlinks are now also included in the installed file list. * GNUmakefile.in: Symlinks are now also included in the installed file list. 2013-09-20 Ivan Vucica <ivan@vucica.net> * deb-equivs-control.template: Added forgotten file. 2013-09-20 Ivan Vucica <ivan@vucica.net> * GNUmakefile.in: Added deb.make. Also added new target, 'deb' which (using 'equivs-build') produces a Debian package for gnustep-make. * Master/deb.make: This file provides new targets 'deb' and 'debfile'. To produce a .deb package, you will need to install package named 'equivs'. At the moment, manual patching of /usr/bin/equivs-build is also necessary; please review comments inside Master/deb.make for further information. 2013-07-27 Wolfgang Lux <wolfgang.lux@gmail.com> * configure.ac: Really fix the test whether the compiler uses the non-fragile ABI by default. It should now work on all platforms with either gcc or clang. * configure: Regenerated. 2013-07-27 Richard Frith-Macdonald <rfm@gnu.org> * configure.ac: Revert last change to get nonfragile abi detection working on gnu/linux and freebsd again (not tested on other platforms). * configure: Regenerated. 2013-07-26 Wolfgang Lux <wolfgang.lux@gmail.com> * configure.ac: Rewrite test whether the compiler supports the non-fragile ABI once more, so that it now reports the correct result. * configure: Regenerated. 2013-07-26 Richard Frith-Macdonald <rfm@gnu.org> * Version: * Documentation/news.texi: * Documentation/releasenotes.texi: Make minor bugfix release ... Version 2.6.5 Update release notes/documentation 2013-07-14 Wolfgang Lux <wolfgang.lux@gmail.com> * configure.ac: Rewrite test whether the compiler supports the non-fragile ABI with portable code that does not rely on a BSD compatible echo command. * configure: Regenerated. 2013-07-04 Richard Frith-Macdonald <rfm@gnu.org> * rules.make: Fix order of includes directories ... SYSTEM_INCLUDES should come last so that conflices between files of the same name in different directories are resolved in the correct/expected order. 2013-06-17 Stefan Bidi <stefanbidi@gmail.com> * TestFramework/gnustep-tests.in: add support for .c and .cc files 2012-04-08 Richard Frith-Macdonald <rfm@gnu.org> * TestFramework/ObjectTesting.h: Fix error performing equality test in copying protocol test macro. 2012-03-28 Richard Frith-Macdonald <rfm@gnu.org> Make release * Version 2.6.4 Update release notes/documentation 2012-03-25 Richard Frith-Macdonald <rfm@gnu.org> * TestFramework/Testing.h: Use -isEqualForTestcase: for PASS_EQUAL macro equality testing if the expected value responds to it. Add informal protocol declaring -isEqualForTestcase: * TestFramework/ObjectTesting.h: Convert protocol checking functions to macros (so error messages get file/line number information) and get copy and coding before/after equality checks to use the PASS_EQUAL macro so that we can easily make customised tests by implementing -isEqualForTestcase: for the class being tested. 2012-03-16 Emmanuel Maillard <mailing-lists@e-maillard.com> * target.make: Add target for android 2012-03-08 Jean-Charles BERTIN <jc.bertin@axinoe.com> * TestFramework/gnustep-tests.in: Fix typo 2012-03-01 Richard Frith-Macdonald <rfm@gnu.org> * common.make: Remove -shared-libgcc linker flag * configure.ac: Add check for clang and add -shared-libgcc to linker flags if we aren't using it (using gcc) but are using exceptions. Tidy a little. Patch based on contribtion by Jean-Charles Bertin. 2012-03-01 Richard Frith-Macdonald <rfm@gnu.org> * Version ... bump subminor number in preparation for next release. 2012-03-01 Richard Frith-Macdonald <rfm@gnu.org> Make release * Version 2.6.3 * Update release notes 2013-02-20 Nicola Pero <nicola.pero@meta-innovation.com> * Instance/framework.make: Removed trailing '/' after $(GNUSTEP_TARGET_LDIR) in a couple of cases, to fix building on non-flattened layout. 2012-01-31 Richard Frith-Macdonald <rfm@gnu.org> * rules.make: A couple more printout targets for managing installation of libobjc2 if gnustep-config is not available (eg not in PATH) but GNUSTEP_MAKEFILES is defined. 2012-09-24 Niels Grewe <niels.grewe@halbordnung.de> * configure.ac: Improve last change based on suggestions by David Chisnall. * configure: Regenerate. 2012-09-24 Niels Grewe <niels.grewe@halbordnung.de> * configure.ac: Also try to detect whether the nonfragile ABI is the compiler default. * configure: Regenerate. 2012-09-01 Niels Grewe <niels.grewe@halbordnung.de> * target.make: Define QNX target. 2012-08-15 Stansilav Yaglo <stanislav-yaglo@yandex.ru> * Instance/framework.make: Patch #7822. Make dummy framework classes subclasses of NSObject. 2012-07-05 Quentin Mathe <quentin.mathe@gmail.com> * configure.ac: Fixed ObjC non fragile ABI check to restore CFLAGS correctly, --enable-objc-nonfragile-abi was breaking native exceptions detection. Based on a patch by Christopher Armstrong, see bug report #36186 * configure: Regenerated. 2012-02-21 Nicola Pero <nicola.pero@meta-innovation.com> * GNUstep.sh.in: Use "setopt shwordsplit" instead of "set -y" to get zsh to emulate sh's traditional word split behaviour. Suggestion by Alex Merry. 2012-02-21 Nicola Pero <nicola.pero@meta-innovation.com> * FilesystemLayouts/README: Updated for the fact that 'fhs' is now the default filesystem layout. Issue pointed out by Fred Kiefer <FredKiefer@gmx.de>. 2012-02-21 Graham Lee <iamleeg@gmail.com> * library-combo.make (OBJC_LIBS): Always set from OBJC_LIB_FLAG when using the 'apple' runtime. 2012-02-17 Adam Fedor <fedor@gnu.org> * Master/nsis.make: Add support for library and framework packages
-rw-r--r--devel/gnustep-make/Makefile13
-rw-r--r--devel/gnustep-make/PLIST8
-rw-r--r--devel/gnustep-make/distinfo17
-rw-r--r--devel/gnustep-make/gnustep.mk5
-rw-r--r--devel/gnustep-make/patches/patch-Instance_framework.make36
-rw-r--r--devel/gnustep-make/patches/patch-ab12
-rw-r--r--devel/gnustep-make/patches/patch-ad17
-rw-r--r--devel/gnustep-make/patches/patch-ae10
-rw-r--r--doc/CHANGES-20203
9 files changed, 47 insertions, 74 deletions
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 58135ed0599..7d7ea6cffc5 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2019/11/03 10:39:13 rillig Exp $
+# $NetBSD: Makefile,v 1.60 2020/04/16 09:21:51 manu Exp $
-DISTNAME= gnustep-make-2.6.2
-PKGREVISION= 2
+DISTNAME= gnustep-make-2.8.0
+#PKGREVISION= 1
CATEGORIES= devel gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
@@ -21,9 +21,11 @@ CONFIGURE_ARGS+= --with-config-file=${PKG_SYSCONFDIR}/GNUstep.conf
CONFIGURE_ARGS+= --with-objc-lib-flag="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lobjc"
MAKE_FILE= GNUmakefile
-CONF_FILES+= ${PREFIX}/share/examples/GNUstep/GNUstep.conf \
+CONF_FILES+= ${PREFIX}/share/examples/GNUstep/GNUstep-strict-v2.conf\
${PKG_SYSCONFDIR}/GNUstep.conf
+REPLACE_BASH+= bake_debian_files.sh
+
.include "gnustep.mk"
.include "../../mk/pthread.buildlink3.mk"
@@ -32,9 +34,6 @@ PTHREAD_LIBS+= -lpth
.endif
CONFIGURE_ARGS+= --with-thread-lib=${PTHREAD_LIBS:Q}
-.if empty(PKG_OPTIONS:Mfragile)
-CONFIGURE_ARGS+= --enable-objc-nonfragile-abi
-.endif
.if ${MACHINE_ARCH} == "i386"
GNUSTEP_ARCH= ix86
diff --git a/devel/gnustep-make/PLIST b/devel/gnustep-make/PLIST
index 924a941bcad..211a1ee58d0 100644
--- a/devel/gnustep-make/PLIST
+++ b/devel/gnustep-make/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2012/10/22 02:06:19 rh Exp $
+@comment $NetBSD: PLIST,v 1.23 2020/04/16 09:21:51 manu Exp $
bin/debugapp
bin/gnustep-config
bin/gnustep-tests
@@ -6,6 +6,7 @@ bin/openapp
bin/opentool
man/man1/debugapp.1
man/man1/gnustep-config.1
+man/man1/gnustep-tests.1.gz
man/man1/openapp.1
man/man1/opentool.1
man/man7/GNUstep.7
@@ -22,6 +23,7 @@ share/GNUstep/Makefiles/Instance/Documentation/texi.make
share/GNUstep/Makefiles/Instance/Shared/bundle.make
share/GNUstep/Makefiles/Instance/Shared/headers.make
share/GNUstep/Makefiles/Instance/Shared/java.make
+share/GNUstep/Makefiles/Instance/Shared/pkgconfig.make
share/GNUstep/Makefiles/Instance/Shared/stamp-string.make
share/GNUstep/Makefiles/Instance/Shared/strings.make
share/GNUstep/Makefiles/Instance/application.make
@@ -49,6 +51,7 @@ share/GNUstep/Makefiles/Master/application.make
share/GNUstep/Makefiles/Master/bundle.make
share/GNUstep/Makefiles/Master/clibrary.make
share/GNUstep/Makefiles/Master/ctool.make
+share/GNUstep/Makefiles/Master/deb.make
share/GNUstep/Makefiles/Master/documentation.make
share/GNUstep/Makefiles/Master/framework.make
share/GNUstep/Makefiles/Master/gswapp.make
@@ -88,6 +91,7 @@ share/GNUstep/Makefiles/TestFramework/example9.m
share/GNUstep/Makefiles/aggregate.make
share/GNUstep/Makefiles/app-wrapper.template
share/GNUstep/Makefiles/application.make
+share/GNUstep/Makefiles/bake_debian_files.sh
share/GNUstep/Makefiles/bundle.make
share/GNUstep/Makefiles/clean_cpu.sh
share/GNUstep/Makefiles/clean_os.sh
@@ -143,7 +147,7 @@ share/GNUstep/Makefiles/test-library.make
share/GNUstep/Makefiles/test-tool.make
share/GNUstep/Makefiles/tool.make
share/GNUstep/Makefiles/vendor.sh
-share/examples/GNUstep/GNUstep.conf
+share/examples/GNUstep/GNUstep-strict-v2.conf
@pkgdir share/GNUstep/Makefiles/${GNUSTEP_ARCH}
@pkgdir share/GNUstep/Makefiles/Auxiliary
@pkgdir share/GNUstep/Makefiles/Additional
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index cb1820ec615..be06d7a6eec 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.29 2015/11/03 03:27:29 agc Exp $
+$NetBSD: distinfo,v 1.30 2020/04/16 09:21:51 manu Exp $
-SHA1 (gnustep-make-2.6.2.tar.gz) = 3f85cb25f4f7fd35cdcbd8d948a2673c84c605ff
-RMD160 (gnustep-make-2.6.2.tar.gz) = 683b6a034d4bb7e17b64209c7e7e289e9e94a042
-SHA512 (gnustep-make-2.6.2.tar.gz) = 5ef7889418e7e5acc40cd045772b08d178333dd7cb396b46bfcc117b8953c868cffff5ad41153f6cf2029f1d78d7213516cf1c2cfc88f028ffb883d0e83ea6a4
-Size (gnustep-make-2.6.2.tar.gz) = 562770 bytes
-SHA1 (patch-Instance_framework.make) = ff6f0259e38f99ce2dd88f9ffc00299da9d1eb86
+SHA1 (gnustep-make-2.8.0.tar.gz) = 5ebc1f89a600ba112874319e4bd0f3699866a7bd
+RMD160 (gnustep-make-2.8.0.tar.gz) = 924687b3cb75f094a7cb5be9e4e1d6abd74c6c4c
+SHA512 (gnustep-make-2.8.0.tar.gz) = e9e57ed7a1c360c2dbf17f70d38e5107a1a9613842dcc645f10ed7a01eb9f9ee71bd2d0cacbe00439ce73f194a3eb3ed2e71409241ac96ee3bba704dcf6dfd7b
+Size (gnustep-make-2.8.0.tar.gz) = 606337 bytes
SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
-SHA1 (patch-ab) = ac45dbe789292feb263cbde11fc8bdaf2e0cb71d
-SHA1 (patch-ad) = 8e4d864a05ea824ff5243c87ef9d6f43892ca661
-SHA1 (patch-ae) = f91fb89ab2c11b73592bae7fe62476e7a353d8d8
+SHA1 (patch-ab) = 5bd17b33f9b8381f77371228057cf6109f76d5b0
+SHA1 (patch-ad) = ee7dfbf7d6a7c35b1141b598b54dde3a2bd237de
+SHA1 (patch-ae) = efd4d53184cb1e34ae129e52235de86f77e8a06a
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index 2a9aa812269..b12b0434156 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gnustep.mk,v 1.28 2019/11/03 10:39:13 rillig Exp $
+# $NetBSD: gnustep.mk,v 1.29 2020/04/16 09:21:51 manu Exp $
.if !defined(GNUSTEP_MK)
GNUSTEP_MK= #defined
@@ -139,9 +139,7 @@ MAKE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q}
MAKE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q}
MAKE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q}
MAKE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q}
-MAKE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
MAKE_ENV+= GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q}
-MAKE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
MAKE_ENV+= GNUSTEP_CONFIG_FILE=${GNUSTEP_CONFIG_FILE:Q}
. if defined(GNUSTEP_OBSOLETE_ENV)
@@ -162,7 +160,6 @@ CONFIGURE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q}
CONFIGURE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q}
CONFIGURE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
CONFIGURE_ENV+= GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q}
-CONFIGURE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
CONFIGURE_ENV+= GNUSTEP_CONFIG_FILE=${GNUSTEP_CONFIG_FILE:Q}
. if defined(GNUSTEP_OBSOLETE_ENV)
diff --git a/devel/gnustep-make/patches/patch-Instance_framework.make b/devel/gnustep-make/patches/patch-Instance_framework.make
deleted file mode 100644
index 927df7fcf80..00000000000
--- a/devel/gnustep-make/patches/patch-Instance_framework.make
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-Instance_framework.make,v 1.2 2015/04/19 04:13:26 manu Exp $
-
-Hunk #1: Don't create interfaces don't derive from NSObject
-
-Hunk #2 and #3: Apply fix from upstream, required to build SOGo
-http://svn.gna.org/viewcvs/gnustep?view=revision&revision=36185
-
---- Instance/framework.make.orig 2013-03-23 21:46:20.000000000 +0000
-+++ Instance/framework.make
-@@ -484,7 +484,7 @@ $(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURC
- fi; \
- echo "$$classarray" > $(DUMMY_FRAMEWORK_CLASS_LIST); \
- echo "#include <Foundation/NSString.h>" > $@; \
-- echo "@interface $(DUMMY_FRAMEWORK)" >> $@; \
-+ echo "@interface $(DUMMY_FRAMEWORK) : NSObject" >> $@; \
- echo "+ (NSString *)frameworkEnv;" >> $@; \
- echo "+ (NSString *)frameworkPath;" >> $@; \
- echo "+ (NSString *)frameworkVersion;" >> $@; \
-@@ -536,7 +536,7 @@
- $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR):
- $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
-
--$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/
-+$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)
- ifeq ($(MAKE_CURRENT_VERSION),yes)
- $(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework; \
- $(RM_LN_S) $(GNUSTEP_INSTANCE); \
-@@ -562,7 +562,7 @@
- $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR):
- $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
-
--$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/
-+$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)
- ifeq ($(MAKE_CURRENT_VERSION),yes)
- $(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR); \
- $(RM_LN_S) $(GNUSTEP_INSTANCE) $(FRAMEWORK_LIBRARY_FILE); \
diff --git a/devel/gnustep-make/patches/patch-ab b/devel/gnustep-make/patches/patch-ab
index a1f949d7bb8..453fc28126d 100644
--- a/devel/gnustep-make/patches/patch-ab
+++ b/devel/gnustep-make/patches/patch-ab
@@ -1,8 +1,9 @@
-$NetBSD: patch-ab,v 1.6 2009/04/18 03:10:33 rh Exp $
+$NetBSD: patch-ab,v 1.7 2020/04/16 09:21:51 manu Exp $
---- config.make.in.orig 2008-05-22 23:16:43.000000000 +1000
-+++ config.make.in
-@@ -116,9 +116,9 @@ LEX = lex
+--- config.make.in.orig 2020-04-05 16:59:54.000000000 +0200
++++ config.make.in 2020-04-14 10:33:05.421958633 +0200
+@@ -153,11 +153,11 @@
+ LEX = lex
CHOWN = chown
STRIP = strip
@@ -13,5 +14,6 @@ $NetBSD: patch-ab,v 1.6 2009/04/18 03:10:33 rh Exp $
+INSTALL_PROGRAM ?= @INSTALL_PROGRAM@
+INSTALL_DATA ?= @INSTALL_DATA@
TAR = @TAR@
+ MAKE = @GNUMAKE@
MKDIRS = $(GNUSTEP_MAKEFILES)/mkinstalldirs
-
+ NM = @NM@
diff --git a/devel/gnustep-make/patches/patch-ad b/devel/gnustep-make/patches/patch-ad
index 837b91ba001..10462ccaabe 100644
--- a/devel/gnustep-make/patches/patch-ad
+++ b/devel/gnustep-make/patches/patch-ad
@@ -1,8 +1,9 @@
-$NetBSD: patch-ad,v 1.11 2012/10/22 02:06:19 rh Exp $
+$NetBSD: patch-ad,v 1.12 2020/04/16 09:21:51 manu Exp $
---- configure.orig 2011-05-03 15:28:07.000000000 +0000
-+++ configure
-@@ -2918,13 +2918,13 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
+--- configure.orig 2020-04-05 16:59:54.000000000 +0200
++++ configure 2020-04-14 10:31:20.723580801 +0200
+@@ -3442,15 +3442,15 @@
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -18,7 +19,9 @@ $NetBSD: patch-ad,v 1.11 2012/10/22 02:06:19 rh Exp $
CFLAGS="-O2"
else
CFLAGS=
-@@ -5484,7 +5484,7 @@ fi
+ fi
+@@ -7462,18 +7462,18 @@
+ fi
fi
if test x"$objc_threaded" = x""; then
@@ -27,7 +30,8 @@ $NetBSD: patch-ad,v 1.11 2012/10/22 02:06:19 rh Exp $
if test "$cross_compiling" = yes; then :
objc_threaded=""
else
-@@ -5493,7 +5493,7 @@ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
#include "config_thread.m"
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
@@ -36,3 +40,4 @@ $NetBSD: patch-ad,v 1.11 2012/10/22 02:06:19 rh Exp $
else
objc_threaded=""
fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
diff --git a/devel/gnustep-make/patches/patch-ae b/devel/gnustep-make/patches/patch-ae
index 5603f244e22..58275aa7b24 100644
--- a/devel/gnustep-make/patches/patch-ae
+++ b/devel/gnustep-make/patches/patch-ae
@@ -1,8 +1,9 @@
-$NetBSD: patch-ae,v 1.9 2012/10/22 02:06:19 rh Exp $
+$NetBSD: patch-ae,v 1.10 2020/04/16 09:21:51 manu Exp $
---- GNUmakefile.in.orig 2011-03-16 10:25:42.000000000 +0000
-+++ GNUmakefile.in
-@@ -180,9 +180,9 @@ install: generated-files
+--- GNUmakefile.in.orig 2020-04-05 16:59:54.000000000 +0200
++++ GNUmakefile.in 2020-04-14 10:31:20.761270469 +0200
+@@ -200,11 +200,11 @@
+ "$(makedir)/Instance" \
"$(makedir)/Instance/Shared" \
"$(makedir)/Instance/Documentation" \
"$(testdir)")
@@ -15,3 +16,4 @@ $NetBSD: patch-ae,v 1.9 2012/10/22 02:06:19 rh Exp $
$(EC)(echo "Installing gnustep-make support software")
$(EC)(for f in config.guess config.sub install-sh mkinstalldirs \
clean_cpu.sh clean_os.sh \
+ clean_vendor.sh cpu.sh os.sh vendor.sh \
diff --git a/doc/CHANGES-2020 b/doc/CHANGES-2020
index 6f95fe915ce..25905a88ed7 100644
--- a/doc/CHANGES-2020
+++ b/doc/CHANGES-2020
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2020,v 1.2309 2020/04/16 09:03:46 manu Exp $
+$NetBSD: CHANGES-2020,v 1.2310 2020/04/16 09:21:51 manu Exp $
Changes to the packages collection and infrastructure in 2020:
@@ -3165,3 +3165,4 @@ Changes to the packages collection and infrastructure in 2020:
Updated www/py-daphne to 2.5.0 [adam 2020-04-16]
Updated databases/mariadb55-client to 5.5.67 [manu 2020-04-16]
Updated databases/mariadb55-server to 5.5.67 [manu 2020-04-16]
+ Updated devel/gnustep-make to 2.8.0 [manu 2020-04-16]