From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 65bc0de8386c318bad7097c46725b515fb303ba1
Date: Thu, 03 Oct 2013 17:27:49 +0200 [thread overview]
Message-ID: <20131003152816.0E88C20F6C@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 7285 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 65bc0de8386c318bad7097c46725b515fb303ba1 (commit)
via c9afaf5acb7549b8bfb5f9c04f56751bd1a09445 (commit)
via fba4dcb13b539e071671ea24ce93f024cc26dfaa (commit)
via 4f7f11bb6ebf03aad34655729bdb0647d3ce73ed (commit)
from 6ea95467a15b6450cb8b05c4caeed2c9e1959554 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 65bc0de8386c318bad7097c46725b515fb303ba1
Merge: c9afaf5 4f7f11b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 3 17:24:59 2013 +0200
Merge remote-tracking branch 'stevee/autogen-update'
commit c9afaf5acb7549b8bfb5f9c04f56751bd1a09445
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Oct 3 13:50:05 2013 +0200
compat-guile: New package.
This is a compat package for the guile 1.8 version.
commit fba4dcb13b539e071671ea24ce93f024cc26dfaa
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Oct 3 13:48:34 2013 +0200
guile: Drop compat package.
This reverts commit f94d8b9d1d0c064de15820aa3d556ef57b3519fe.
From now we will ship the compat libraries on an own package.
commit 4f7f11bb6ebf03aad34655729bdb0647d3ce73ed
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon Sep 30 21:14:09 2013 +0200
autogen: Update to 5.18.1.
This is a major update to the latest stable version.
Fixes the issue with wrong search path for guile modules.
-----------------------------------------------------------------------
Summary of changes:
autogen/autogen.nm | 17 ++++----
guile/guile.nm => compat-guile/compat-guile.nm | 56 +++++++++-----------------
guile/guile.nm | 32 +--------------
3 files changed, 31 insertions(+), 74 deletions(-)
copy guile/guile.nm => compat-guile/compat-guile.nm (62%)
Difference in files:
diff --git a/autogen/autogen.nm b/autogen/autogen.nm
index dbf95ef..90d9a32 100644
--- a/autogen/autogen.nm
+++ b/autogen/autogen.nm
@@ -4,7 +4,7 @@
###############################################################################
name = autogen
-version = 5.14
+version = 5.18.1
release = 1
groups = Development/Tools
@@ -13,9 +13,9 @@ license = GPLv3
summary = Automated text file generator.
description
- AutoGen is a tool designed to simplify the creation and maintenance of \
- programs that contain large amounts of repetitious text. It is especially \
- valuable in programs that have several blocks of text that must be kept \
+ AutoGen is a tool designed to simplify the creation and maintenance of
+ programs that contain large amounts of repetitious text. It is especially
+ valuable in programs that have several blocks of text that must be kept
synchronised.
end
@@ -23,14 +23,13 @@ source_dl = ftp://ftp.gnu.org/gnu/autogen/rel%{version}/
build
requires
- guile-devel
+ guile-devel >= 2.0.9-3
libtool
libxml2-devel
end
- LDFLAGS += -lguile
-
prepare_cmds
+ # Fix Libtool to remove rpaths.
rm -vf libtool
cp -vf $(which libtool) libtool
@@ -38,6 +37,10 @@ build
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' ./libtool
end
+ test
+ make check
+ end
+
install_cmds
rm -vf %{BUILDROOT}%{datadir}/%{name}/autoopts.m4
rm -vf %{BUILDROOT}%{datadir}/%{name}/libopts-31.0.6.tar.gz
diff --git a/compat-guile/compat-guile.nm b/compat-guile/compat-guile.nm
new file mode 100644
index 0000000..8bac023
--- /dev/null
+++ b/compat-guile/compat-guile.nm
@@ -0,0 +1,70 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = compat-guile
+version = 1.8.8
+release = 1
+thisapp = guile-%{version}
+
+groups = Development/Tools
+url = http://www.gnu.org/software/guile/
+license = GPLv2+ and LGPLv2+ and GFDL and OFSFDL
+summary = A GNU implementation of Scheme for application extensibility.
+
+description
+ GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library
+ implementation of the Scheme programming language, written in C. GUILE
+ provides a machine-independent execution platform that can be linked in
+ as a library during the building of extensible programs.
+end
+
+source_dl = ftp://ftp.gnu.org/gnu/guile/
+
+build
+ requires
+ gc-devel
+ gettext-devel
+ gmp-devel
+ libffi-devel >= 3.0.13
+ libtool-devel
+ libunistring-devel
+ readline-devel
+ end
+
+ configure_options += \
+ --disable-static \
+ --disable-error-on-warning
+
+ install_cmds
+ # Drop unneeded stuff.
+ rm -rvf %{BUILDROOT}%{bindir}
+ rm -rvf %{BUILDROOT}%{includedir}
+ rm -rvf %{BUILDROOT}%{libdir}/pkgconfig
+ rm -rvf %{BUILDROOT}%{libdir}/*.so
+ rm -rvf %{BUILDROOT}%{datadir}/aclocal
+ rm -rvf %{BUILDROOT}%{datadir}/info
+ rm -rvf %{BUILDROOT}%{datadir}/man
+ end
+end
+
+packages
+ package %{name}
+ provides
+ guile = %{thisver}
+ end
+
+ obsoletes
+ guile-compat <= %{thisver}
+ end
+
+ conflicts
+ guile <= %{thisver}
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/guile/guile.nm b/guile/guile.nm
index 4834692..06b7825 100644
--- a/guile/guile.nm
+++ b/guile/guile.nm
@@ -5,9 +5,7 @@
name = guile
version = 2.0.9
-release = 2
-
-compat_ver = 1.8.8
+release = 3
groups = Development/Tools
url = http://www.gnu.org/software/guile/
@@ -22,7 +20,6 @@ description
end
source_dl = ftp://ftp.gnu.org/gnu/guile/
-sources += %{name}-%{compat_ver}.tar.gz
build
requires
@@ -39,44 +36,19 @@ build
--disable-static \
--disable-error-on-warning
- build_cmds
- pushd %{DIR_SRC}/%{name}-%{compat_ver}
- ./configure %{configure_options}
- make %{PARALLELISMFLAGS}
- popd
- end
-
test
make check
-
- #pushd %{DIR_SRC}/%{name}-%{compat_ver}
- #make check
- #popd
- end
-
- install_cmds
- pushd %{DIR_SRC}/%{name}-%{compat_ver}
- install -m 755 libguile/.libs/libguile.so.17.4.0 %{BUILDROOT}%{libdir}
- ln -svf libguile.so.17.4.0 %{BUILDROOT}%{libdir}/libguile.so.17
- popd
end
end
packages
package %{name}
- package %{name}-compat
- summary = Compat libraries of %{thisapp}.
-
- files
- %{libdir}/libguile.so.17*
- end
- end
-
package %{name}-devel
template DEVEL
requires
+ gc-devel
gmp-devel
libtool-devel
end
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2013-10-03 15:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131003152816.0E88C20F6C@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox