From: Andrew Deason <adeason@sinenomine.net>
Date: Wed, 22 Dec 2010 15:46:11 +0000 (-0500)
Subject: Link hcrypto before roken
X-Git-Tag: upstream/1.8.0_pre1^2~4335
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b3c3fe137ed89f698fdd0a12e68582141d216548;p=packages%2Fo%2Fopenafs.git

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 63007aa1d..b279e8738 100644
--- 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 c1f6f3620..9dec8dd40 100644
--- 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}