[389-commits] [389-ds-base] 01/01: Ticket 49247 - resolve build issues on debian

This is an automated email from the git hooks/post-receive script.

firstyear pushed a commit to branch 389-ds-base-1.3.6
in repository 389-ds-base.

commit c66cc6c64c22beef55519422accf9cecfdccd493
Author: William Brown <firstyear@redhat.com>
Date: Wed May 10 15:44:29 2017 +1000

Ticket 49247 - resolve build issues on debian

Bug Description: Debian shows a number of issues with our makefile due
to a missing nspr link, and incorrect header.

Fix Description: Fix the linking statement, and correct the header
usage.

https://pagure.io/389-ds-base/issue/49247

Author: wibrown

Review by: mreynolds (Thanks!)

cherry-pick from commit e0289b77cc90150fe6cc1a373238ea7cf5066340
---
Makefile.am | 15 ++++++++-------
test/plugins/pwdstorage/pbkdf2.c | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e2421ab..08499e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2014,7 +2014,8 @@ test_slapd_SOURCES = test/main.c \

# We need to link a lot of plugins for this test.
test_slapd_LDADD = libslapd.la \
- libpwdstorage-plugin.la
+ libpwdstorage-plugin.la \
+ $(NSS_LINK) $(NSPR_LINK)
test_slapd_LDFLAGS = $(AM_CPPFLAGS) $(CMOCKA_LINKS)
### WARNING: Slap.h needs cert.h, which requires the -I/lib/ldaputil!!!
### WARNING: Slap.h pulls ssl.h, which requires nss!!!!
@@ -2034,35 +2035,35 @@ test_libsds_SOURCES = src/libsds/test/test_sds.c \
src/libsds/test/test_fixtures.c

test_libsds_LDFLAGS = $(ASAN_DEFINES) $(PROFILING_LINKS) $(CMOCKA_LINKS)
-test_libsds_LDADD = libsds.la
+test_libsds_LDADD = libsds.la $(NSPR_LINK)
test_libsds_CPPFLAGS = $(AM_CPPFLAGS) $(CMOCKA_INCLUDES) $(SDS_CPPFLAGS)

benchmark_sds_SOURCES = src/libsds/test/benchmark.c \
$(libavl_a_SOURCES)
benchmark_sds_LDFLAGS = $(ASAN_DEFINES) $(PROFILING_LINKS) $(CMOCKA_LINKS)
-benchmark_sds_LDADD = libsds.la
+benchmark_sds_LDADD = libsds.la $(NSPR_LINK)
benchmark_sds_CPPFLAGS = $(AM_CPPFLAGS) $(CMOCKA_INCLUDES) $(SDS_CPPFLAGS) $(DS_INCLUDES)

benchmark_par_sds_SOURCES = src/libsds/test/benchmark_parwrap.c \
src/libsds/test/benchmark_par.c \
$(libavl_a_SOURCES)
benchmark_par_sds_LDFLAGS = $(ASAN_DEFINES) $(PROFILING_LINKS) $(CMOCKA_LINKS)
-benchmark_par_sds_LDADD = libsds.la
+benchmark_par_sds_LDADD = libsds.la $(NSPR_LINK)
benchmark_par_sds_CPPFLAGS = $(AM_CPPFLAGS) $(CMOCKA_INCLUDES) $(SDS_CPPFLAGS) $(DS_INCLUDES)

test_nuncstans_SOURCES = src/nunc-stans/test/test_nuncstans.c
test_nuncstans_CPPFLAGS = $(AM_CPPFLAGS) $(CMOCKA_INCLUDES) $(NUNCSTANS_CPPFLAGS)
-test_nuncstans_LDADD = libnunc-stans.la libsds.la
+test_nuncstans_LDADD = libnunc-stans.la libsds.la $(NSPR_LINK)
test_nuncstans_LDFLAGS = $(ASAN_DEFINES) $(PROFILING_LINKS) $(CMOCKA_LINKS) $(EVENT_LINK)

test_nuncstans_stress_large_SOURCES = src/nunc-stans/test/test_nuncstans_stress_large.c src/nunc-stans/test/test_nuncstans_stress_core.c
test_nuncstans_stress_large_CPPFLAGS = $(AM_CPPFLAGS) $(CMOCKA_INCLUDES) $(NUNCSTANS_CPPFLAGS)
-test_nuncstans_stress_large_LDADD = libnunc-stans.la libsds.la
+test_nuncstans_stress_large_LDADD = libnunc-stans.la libsds.la $(NSPR_LINK)
test_nuncstans_stress_large_LDFLAGS = $(ASAN_DEFINES) $(PROFILING_LINKS) $(CMOCKA_LINKS) $(EVENT_LINK)

test_nuncstans_stress_small_SOURCES = src/nunc-stans/test/test_nuncstans_stress_small.c src/nunc-stans/test/test_nuncstans_stress_core.c
test_nuncstans_stress_small_CPPFLAGS = $(AM_CPPFLAGS) $(CMOCKA_INCLUDES) $(NUNCSTANS_CPPFLAGS)
-test_nuncstans_stress_small_LDADD = libnunc-stans.la libsds.la
+test_nuncstans_stress_small_LDADD = libnunc-stans.la libsds.la $(NSPR_LINK)
test_nuncstans_stress_small_LDFLAGS = $(ASAN_DEFINES) $(PROFILING_LINKS) $(CMOCKA_LINKS) $(EVENT_LINK)


diff --git a/test/plugins/pwdstorage/pbkdf2.c b/test/plugins/pwdstorage/pbkdf2.c
index abadbfb..0193fbb 100644
--- a/test/plugins/pwdstorage/pbkdf2.c
+++ b/test/plugins/pwdstorage/pbkdf2.c
@@ -8,7 +8,7 @@

#include "../../test_slapd.h"

-#include <nss3/nss.h>
+#include <nss.h>
#include <pwdstorage.h>

int

--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
389-commits mailing list -- 389-commits@lists.fedoraproject.org
To unsubscribe send an email to 389-commits-leave@lists.fedoraproject.org