aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--Makefile2
-rw-r--r--NEWS2
-rwxr-xr-xconfigure9
-rw-r--r--doc/index.html4
-rw-r--r--doc/license.html2
-rw-r--r--doc/upgrade.html2
-rw-r--r--package/info2
8 files changed, 17 insertions, 7 deletions
diff --git a/AUTHORS b/AUTHORS
index 455482c..d7f3ec4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -55,3 +55,4 @@ Thanks to:
Henri Kemppainen <hmk@guu.fi>
Jan Pobříslo <ccx@te2000.cz>
Anna Figueiredo Gomes <navi@vlhl.dev>
+ Markus Sauermann <sauermann@disroot.org>
diff --git a/Makefile b/Makefile
index d1af3ec..2264a91 100644
--- a/Makefile
+++ b/Makefile
@@ -138,7 +138,7 @@ libskarnet.a.xyzzy: $(ALL_SOBJS)
exec $(RANLIB) $@
libskarnet.so.xyzzy: $(ALL_DOBJS)
- exec $(CC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $(LDFLAGS_SHARED) -Wl,-soname,libskarnet.so.$(version_M) -Wl,-rpath=$(dynlibdir) $^ $(SYSTEM_LIBS)
+ exec $(CC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $(LDFLAGS_SHARED) -Wl,-soname,libskarnet.so.$(version_M) $(LDFLAGS_RPATH) $^ $(SYSTEM_LIBS)
libskarnet.pc:
exec env \
diff --git a/NEWS b/NEWS
index f3c256e..0e8cf45 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
Changelog for skalibs.
-In 2.14.6.0
+In 2.15.0.0
-----------
- Bugfixes.
diff --git a/configure b/configure
index dd00e76..53d4aa7 100755
--- a/configure
+++ b/configure
@@ -38,6 +38,7 @@ Optional features:
--disable-shared do not build shared libraries [enabled]
--disable-static do not build static libraries [enabled]
--disable-all-pic do not build static libraries as PIC [enabled]
+ --disable-rpath do not embed RPATH in libraries [enabled]
--enable-slashpackage[=ROOT] assume /package installation at ROOT [disabled]
--enable-pkgconfig Build and install .pc files for pkg-config [disabled]
@@ -403,6 +404,7 @@ shlibext=so
shared=true
static=true
allpic=true
+rpath=true
slashpackage=false
ipv6=true
select=false
@@ -443,6 +445,8 @@ for arg ; do
--disable-static|--enable-static=no) static=false ;;
--enable-all-pic|--enable-all-pic=yes) allpic=true ;;
--disable-all-pic|--enable-all-pic=no) allpic=false ;;
+ --enable-rpath|--enable-rpath=yes) rpath=true ;;
+ --disable-rpath|--enable-rpath=no) rpath=false ;;
--enable-pkgconfig|--enable-pkgconfig=yes) pcw=true ;;
--disable-pkgconfig|--enable-pkgconfig=no) pcw=false ;;
--enable-slashpackage=*) sproot=${arg#*=} ; slashpackage=true ; ;;
@@ -795,6 +799,11 @@ if $shared ; then
else
echo "SHARED_LIBS :="
fi
+if $rpath ; then
+ echo "LDFLAGS_RPATH := -Wl,-rpath=${dynlibdir}"
+else
+ echo "LDFLAGS_RPATH :="
+fi
if $pcw ; then
echo "DO_PKGCONFIG := 1"
else
diff --git a/doc/index.html b/doc/index.html
index 8c90840..1bf3b16 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -60,8 +60,8 @@ with a standard C development environment </li>
<h3> Download </h3>
<ul>
- <li> The current released version of skalibs is <a href="skalibs-2.14.6.0.tar.gz">2.14.6.0</a>.
-You can access its checksum <a href="skalibs-2.14.6.0.tar.gz.sha256">here</a>. </li>
+ <li> The current released version of skalibs is <a href="skalibs-2.15.0.0.tar.gz">2.15.0.0</a>.
+You can access its checksum <a href="skalibs-2.15.0.0.tar.gz.sha256">here</a>. </li>
<li> Alternatively, you can checkout a copy of the
<a href="//git.skarnet.org/cgi-bin/cgit.cgi/skalibs/">skalibs
git repository</a>:
diff --git a/doc/license.html b/doc/license.html
index 43f7138..052448a 100644
--- a/doc/license.html
+++ b/doc/license.html
@@ -74,7 +74,7 @@ color, or different text font. </li>
<p>
<em>I am aware that the previous restrictions sound completely
ridiculous while the official skalibs documentation is incomplete.
-As of 2.14.6.0, I'm not going to enforce those restrictions, but if you're
+As of 2.15.0.0, I'm not going to enforce those restrictions, but if you're
going to provide documentation for skalibs, don't keep it to yourself,
please send it to me instead. :-) </em>
</p>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index d9c8ee1..ea8ddcc 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -16,7 +16,7 @@
<a href="//skarnet.org/">skarnet.org</a>
</p>
-<h2> in 2.14.6.0 </h2>
+<h2> in 2.15.0.0 </h2>
<ul>
<li> New family of functions: sassclient and sassserver, working on top
diff --git a/package/info b/package/info
index b986cde..01bbfcc 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=skalibs
-version=2.14.6.0
+version=2.15.0.0
category=prog
package_macro_name=SKALIBS