forked from pool/reiser4progs
Jan Engelhardt
299a7b5675
OBS-URL: https://build.opensuse.org/package/show/filesystems/reiser4progs?expand=0&rev=20
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
Date: 2017-09-02 13:14:23.021280169 +0200
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
build: make the build work with just shared libs
|
|
---
|
|
configure.ac | 6 ------
|
|
libreiser4/Makefile.am | 1 -
|
|
2 files changed, 7 deletions(-)
|
|
|
|
Index: reiser4progs-2.0.4/configure.ac
|
|
===================================================================
|
|
--- reiser4progs-2.0.4.orig/configure.ac
|
|
+++ reiser4progs-2.0.4/configure.ac
|
|
@@ -70,9 +70,6 @@ libaal_config_minor_version=`echo $2 | \
|
|
libaal_config_micro_version=`echo $2 | \
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
|
|
-OLD_CFLAGS=$CFLAGS
|
|
-CFLAGS="$CFLAGS -static"
|
|
-
|
|
# Compare MINIMUM-VERSION with libaal version
|
|
AC_TRY_RUN([
|
|
#include <stdio.h>
|
|
@@ -116,8 +113,6 @@ int main() {
|
|
AC_MSG_RESULT(no) ; $4,
|
|
[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
|
|
-CFLAGS=$OLD_CFLAGS
|
|
-
|
|
# Execute ACTION-IF-FOUND
|
|
$3])
|
|
|
|
@@ -126,7 +121,6 @@ AC_ARG_WITH(libaal,
|
|
)
|
|
|
|
LIBS=""
|
|
-CFLAGS="$CFLAGS"
|
|
|
|
if test x$with_libaal != x; then
|
|
LIBS="-L$with_libaal/lib"
|
|
Index: reiser4progs-2.0.4/libreiser4/Makefile.am
|
|
===================================================================
|
|
--- reiser4progs-2.0.4.orig/libreiser4/Makefile.am
|
|
+++ reiser4progs-2.0.4/libreiser4/Makefile.am
|
|
@@ -30,7 +30,6 @@ libreiser4_static_la_LIBADD = $(top_bui
|
|
|
|
libreiser4_static_la_SOURCES = $(libreiser4_sources)
|
|
libreiser4_static_la_CFLAGS = @GENERIC_CFLAGS@
|
|
-libreiser4_static_la_LDFLAGS = -static
|
|
|
|
if ENABLE_MINIMAL
|
|
libreiser4_minimal_la_LIBADD = $(top_builddir)/libmisc/libmisc-minimal.la \
|