From 9f9794c0e20f735a6e235cfdd3fb864012d3b41f Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:46:44 +0000 Subject: [PATCH 1/5] Initialize branch FC-6 for yap --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 45d76d072d8ce8653e7f48a260b05d8e480f0b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= Date: Fri, 11 May 2007 20:39:50 +0000 Subject: [PATCH 2/5] remove -fstack-protector from optflags in order to enable loading of .so modules --- yap.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index bf07ba7..6c0fb00 100644 --- a/yap.spec +++ b/yap.spec @@ -1,6 +1,6 @@ Name: yap Version: 5.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance Prolog Compiler @@ -50,6 +50,7 @@ Documentation for Yap. cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr %build +%define optflags $(echo $RPM_OPT_FLAGS | sed 's|-fstack-protector||') %configure \ --enable-coroutining \ --enable-max-performance \ @@ -120,6 +121,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 11 2007 Gerard Milmeister - 5.1.1-3 +- remove -fstack-protector from optflags in order to enable + loading of .so modules + * Mon Aug 28 2006 Gerard Milmeister - 5.1.1-2 - Rebuild for FE6 From 5f80b6edef7c62a0f770ca862a1b54c447afac6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= Date: Thu, 5 Jul 2007 15:50:23 +0000 Subject: [PATCH 3/5] also build libYap.so --- yap.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/yap.spec b/yap.spec index 6c0fb00..bb7d987 100644 --- a/yap.spec +++ b/yap.spec @@ -1,6 +1,6 @@ Name: yap Version: 5.1.1 -Release: 3%{?dist} +Release: 5%{?dist} Summary: High-performance Prolog Compiler @@ -48,13 +48,17 @@ Documentation for Yap. %setup -q -n Yap-%{version} %patch1 -p1 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr +# remove redundant rpath +sed -i "/-Wl,-R/d" configure + %build %define optflags $(echo $RPM_OPT_FLAGS | sed 's|-fstack-protector||') %configure \ --enable-coroutining \ --enable-max-performance \ - --enable-depth-limit + --enable-depth-limit \ + --enable-dynamic-loading make %{?_smp_mflags} (cd docs; make info) @@ -101,6 +105,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/yap %{_datadir}/Yap %{_prefix}/lib/Yap +%{_prefix}/lib/libYap.so %{_infodir}/* @@ -121,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 5 2007 Gerard Milmeister - 5.1.1-5 +- also build libYap.so + * Fri May 11 2007 Gerard Milmeister - 5.1.1-3 - remove -fstack-protector from optflags in order to enable loading of .so modules From 3e708a5063a6bb79eac2349033ed4638844ac78c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:19 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4e22fad..0cb1d1b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: yap -# $Id$ +# $Id: Makefile,v 1.1 2005/02/12 00:22:52 gemi Exp $ NAME := yap SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From d7b89cecf88ae8fb485e5497389ec3b1b2e3c130 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:19:10 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0cb1d1b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: yap -# $Id: Makefile,v 1.1 2005/02/12 00:22:52 gemi Exp $ -NAME := yap -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6