Link hcrypto before roken

We must e.g. -lafshcrypto before we -lrokenafs, since stuff in hcrypto
can use functions provided by roken (such as ct_memcmp or
rk_cloexec_file). Fix any users of LIB_hcrypto that do not do this to
put LIB_roken after LIB_hcrypto.

Change-Id: I55f5589a521ed7da7a6692d817e94f18076ff4bc
Reviewed-on: http://gerrit.openafs.org/3584
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in
index 63007aa..b279e87 100644 (file)
--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@@ -37,7 +37,7 @@ afsd: afsd.o afsd_kernel.o $(AFSLIBS) $(AFSD_LIBS)
 LDFLAGS_afsd.fuse = $(AFSD_LDFLAGS)
 afsd.fuse: afsd_fuse.o $(UAFSLIBS) $(AFSD_LIBS)
        ${AFS_LDRULE} afsd_fuse.o $(NON_SHARED) \
-               $(UAFSLIBS) $(LIB_roken) $(LIB_hcrypto) $(LIB_crypt) \
+               $(UAFSLIBS) $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) \
                ${XLIBS} ${FUSE_LIBS} ${AFSD_LIBS}
 
 vsys: vsys.o

diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in
index c1f6f36..9dec8dd 100644 (file)
--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@@ -181,7 +181,7 @@ namei_ops.o: ${VOL}/namei_ops.c
 
 salvageserver: ${OBJECTS} ${LIBS}
        $(AFS_LDRULE) ${OBJECTS} ${LIBS} \
-               $(LIB_roken) $(LIB_hcrypto) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
+               $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
 
 dasalvager: ${SOBJECTS} ${SLIBS}
        $(AFS_LDRULE) ${SOBJECTS} ${SLIBS} \
@@ -189,11 +189,11 @@ dasalvager: ${SOBJECTS} ${SLIBS}
 
 dafssync-debug: ${FSSDEBUG_OBJS} ${LIBS}
        $(AFS_LDRULE) ${FSSDEBUG_OBJS} ${LIBS} \
-               $(LIB_roken) $(LIB_hcrypto) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
+               $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
 
 salvsync-debug: ${SSSDEBUG_OBJS} ${LIBS}
        $(AFS_LDRULE) ${SSSDEBUG_OBJS} ${LIBS} \
-               $(LIB_roken) $(LIB_hcrypto) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
+               $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
 
 install: salvageserver dafssync-debug salvsync-debug dasalvager
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}