summaryrefslogtreecommitdiff
path: root/www/aws/files/patch-makefile
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2014-05-17 21:21:18 +0000
committerJohn Marino <marino@FreeBSD.org>2014-05-17 21:21:18 +0000
commit640e99a0f6887cb0f070643d171169e1da4f49d4 (patch)
treef6a8954a7893825ab7b8e43c4e213aa2ab61806b /www/aws/files/patch-makefile
parent- Update to 2.6.1 (diff)
www/aws: Upgrade from 3.1.0.0 => 3.2.0.0
The templates parser was split out from AWS and due to quirk how GPRBuild interacts with aggregate library projects, linking it as a separate library was more than challenging. It would drop a library exchange file (aws.lexch) in /usr/local/lib/templates_parser during the linking process. Ports are not support to touch areas outside of their work directory -- if they do, builders will notice and fail the port. After hours of trying to get GPRLib to behave, I was reduced to copying the *.ali files over to the work directory and creating a custom gpr file to make linking legal. In the process, I noticed AWS was linking back to work directory (sanity checks don't flag this yet) so that was fixed the the custom "-R" option that I added to GPRBuild a couple of years ago. I had to create a custom aws.gpr file for lib/gnat, and it works really well. Currently something like 238 of 243 tests are passing and the failing ones are socket related and may looking for linux-specific output in a couple of cases. * Documentation is now based on Sphinx. * A fixed package list has replaced the generated one (due to number of options, this was a real chore to generate and validate) * The option to generate only a shared library was removed. It was confusing and not really useful. It produces static and shared libraries by default, and the shared ones can be suppressed optionally. * The FreeBSD-specific makefile was removed. The previous issue was caused by the way the compiler was built which has since been fixed * ASIS was added as dependency * RUN_DEPENDS were defined (they were missing before) * GNUTLS support was fixed. It requires version 3 now and does not required gcrypt or openssl anymore which indicated a previous problem. The aws-demos port had some missing files and other problems. It has been updated at the same time. Note that the output directory has changed from share/examples/aws-demos to share/examples/aws. A couple of tests that were broken now build, and a new test was added. This update comes straight from the latest repositories and was custom packaged. The annual Adacore release was about 5 months old.
Diffstat (limited to 'www/aws/files/patch-makefile')
-rw-r--r--www/aws/files/patch-makefile35
1 files changed, 25 insertions, 10 deletions
diff --git a/www/aws/files/patch-makefile b/www/aws/files/patch-makefile
index e91eeca06a2d..88d3ca23cc4e 100644
--- a/www/aws/files/patch-makefile
+++ b/www/aws/files/patch-makefile
@@ -1,12 +1,27 @@
-Prevent empty ${EXAMPLESDIR}/bin directory from being created
-
---- makefile.orig 2013-07-03 01:11:54.000000000 +0000
+--- makefile.orig 2014-05-15 19:48:07.000000000 +0000
+++ makefile
-@@ -390,7 +390,6 @@ endif
- $(MKDIR) -p $(DESTDIR)$(I_AGP)
- $(MKDIR) -p $(DESTDIR)$(I_TPL)
- $(MKDIR) -p $(DESTDIR)$(I_IMG)
-- $(MKDIR) -p $(DESTDIR)$(I_SBN)
- $(MKDIR) -p $(DESTDIR)$(I_PLG)
- $(MKDIR) -p $(DESTDIR)$(I_WEL)
+@@ -61,15 +61,14 @@ ALL_OPTIONS = $(MAKE_OPT) SOCKET="$(SOCK
+ GPRBUILD="$(GPRBUILD)" ZLIB="$(ZLIB)" BDIR="$(BDIR)" \
+ prefix="$(prefix)" ENABLE_SHARED="$(ENABLE_SHARED)" \
+ SOEXT="$(SOEXT)" BUILD_DOC_SCRIPT="false" GNAT="$(GNAT)" \
+- T2A="../../$(BDIR)/static/tools/templates2ada" \
++ T2A="$(prefix)/bin/templates2ada" \
+ LIBRARY_TYPE="$(LIBRARY_TYPE)" PYTHON="$(PYTHON)" \
+ TARGET="$(TARGET)" IS_CROSS=$(IS_CROSS) GPRINSTALL="$(GPRINSTALL)"
+ build-doc:
+ echo ""
+ echo "=== Build doc"
+- ${MAKE} -C docs html latexpdf
+- ${MAKE} -C templates_parser/docs html latexpdf
++ ${MAKE} -C docs html
+
+ run_regtests:
+ echo ""
+@@ -343,4 +342,5 @@ gen_setup:
+ setup: gen_setup setup_dir setup_modules setup_config setup_tp $(GEXT_MODULE)
+
+ setup_tp:
+- $(MAKE) -C templates_parser setup $(GALL_OPTIONS)
++ echo "Templates Parser has already been externally built"
++ #$(MAKE) -C templates_parser setup $(GALL_OPTIONS)