124 lines
3.6 KiB
Diff
124 lines
3.6 KiB
Diff
Fix build fails for libsubid (libtool: error: cannot find name of link library for '../libsubid/libsubid.la').
|
|
Consisting of following upstream commits:
|
|
* f4a84efb468b8be21be124700ce35159c444e9d6
|
|
* 537b8cd90be7b47b45c45cfd27765ef85eb0ebf1
|
|
* fa986b1d73605ecca54a4f19249227aeab827bf6
|
|
Index: shadow-4.9/configure.ac
|
|
===================================================================
|
|
--- shadow-4.9.orig/configure.ac
|
|
+++ shadow-4.9/configure.ac
|
|
@@ -321,6 +321,8 @@ if test "$with_sha_crypt" = "yes"; then
|
|
AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms])
|
|
fi
|
|
|
|
+AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes")
|
|
+
|
|
AM_CONDITIONAL(USE_BCRYPT, test "x$with_bcrypt" = "xyes")
|
|
if test "$with_bcrypt" = "yes"; then
|
|
AC_DEFINE(USE_BCRYPT, 1, [Define to allow the bcrypt password encryption algorithm])
|
|
Index: shadow-4.9/lib/Makefile.am
|
|
===================================================================
|
|
--- shadow-4.9.orig/lib/Makefile.am
|
|
+++ shadow-4.9/lib/Makefile.am
|
|
@@ -10,6 +10,8 @@ if HAVE_VENDORDIR
|
|
libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\"
|
|
endif
|
|
|
|
+libshadow_la_CPPFLAGS += -I$(top_srcdir)
|
|
+
|
|
libshadow_la_SOURCES = \
|
|
commonio.c \
|
|
commonio.h \
|
|
Index: shadow-4.9/libmisc/Makefile.am
|
|
===================================================================
|
|
--- shadow-4.9.orig/libmisc/Makefile.am
|
|
+++ shadow-4.9/libmisc/Makefile.am
|
|
@@ -1,7 +1,7 @@
|
|
|
|
EXTRA_DIST = .indent.pro xgetXXbyYY.c
|
|
|
|
-AM_CPPFLAGS = -I$(top_srcdir)/lib $(ECONF_CPPFLAGS)
|
|
+AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(ECONF_CPPFLAGS)
|
|
|
|
noinst_LTLIBRARIES = libmisc.la
|
|
|
|
Index: shadow-4.9/libsubid/Makefile.am
|
|
===================================================================
|
|
--- shadow-4.9.orig/libsubid/Makefile.am
|
|
+++ shadow-4.9/libsubid/Makefile.am
|
|
@@ -1,6 +1,8 @@
|
|
lib_LTLIBRARIES = libsubid.la
|
|
+if ENABLE_SHARED
|
|
libsubid_la_LDFLAGS = -Wl,-soname,libsubid.so.@LIBSUBID_ABI@ \
|
|
-shared -version-info @LIBSUBID_ABI_MAJOR@
|
|
+endif
|
|
libsubid_la_SOURCES = api.c
|
|
|
|
pkginclude_HEADERS = subid.h
|
|
@@ -16,11 +18,12 @@ MISCLIBS = \
|
|
$(LIBCRYPT) \
|
|
$(LIBACL) \
|
|
$(LIBATTR) \
|
|
- $(LIBTCB)
|
|
+ $(LIBTCB) \
|
|
+ $(LIBPAM)
|
|
|
|
libsubid_la_LIBADD = \
|
|
- $(top_srcdir)/lib/libshadow.la \
|
|
- $(top_srcdir)/libmisc/libmisc.la \
|
|
+ $(top_builddir)/lib/libshadow.la \
|
|
+ $(top_builddir)/libmisc/libmisc.la \
|
|
$(MISCLIBS) -ldl
|
|
|
|
AM_CPPFLAGS = \
|
|
Index: shadow-4.9/src/Makefile.am
|
|
===================================================================
|
|
--- shadow-4.9.orig/src/Makefile.am
|
|
+++ shadow-4.9/src/Makefile.am
|
|
@@ -10,6 +10,7 @@ sgidperms = 2755
|
|
AM_CPPFLAGS = \
|
|
-I${top_srcdir}/lib \
|
|
-I$(top_srcdir)/libmisc \
|
|
+ -I$(top_srcdir) \
|
|
-DLOCALEDIR=\"$(datadir)/locale\"
|
|
|
|
# XXX why are login and su in /bin anyway (other than for
|
|
@@ -183,6 +184,7 @@ list_subid_ranges_LDADD = \
|
|
list_subid_ranges_CPPFLAGS = \
|
|
-I$(top_srcdir)/lib \
|
|
-I$(top_srcdir)/libmisc \
|
|
+ -I$(top_srcdir) \
|
|
-I$(top_srcdir)/libsubid
|
|
|
|
get_subid_owners_LDADD = \
|
|
@@ -194,11 +196,13 @@ get_subid_owners_LDADD = \
|
|
get_subid_owners_CPPFLAGS = \
|
|
-I$(top_srcdir)/lib \
|
|
-I$(top_srcdir)/libmisc \
|
|
+ -I$(top_srcdir) \
|
|
-I$(top_srcdir)/libsubid
|
|
|
|
new_subid_range_CPPFLAGS = \
|
|
-I$(top_srcdir)/lib \
|
|
-I$(top_srcdir)/libmisc \
|
|
+ -I$(top_srcdir) \
|
|
-I$(top_srcdir)/libsubid
|
|
|
|
new_subid_range_LDADD = \
|
|
@@ -210,6 +214,7 @@ new_subid_range_LDADD = \
|
|
free_subid_range_CPPFLAGS = \
|
|
-I$(top_srcdir)/lib \
|
|
-I$(top_srcdir)/libmisc \
|
|
+ -I$(top_srcdir) \
|
|
-I$(top_srcdir)/libsubid
|
|
|
|
free_subid_range_LDADD = \
|
|
@@ -220,6 +225,7 @@ free_subid_range_LDADD = \
|
|
|
|
check_subid_range_CPPFLAGS = \
|
|
-I$(top_srcdir)/lib \
|
|
+ -I$(top_srcdir) \
|
|
-I$(top_srcdir)/libmisc
|
|
|
|
check_subid_range_LDADD = \
|