Commit 66fc9c43 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

isal: If using ISA-L submodule, install it during 'make install' 



Signed-off-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21386

 (master)

(cherry picked from commit b02581a8)
Change-Id: I6934c3c23969bfce6365e67397147c1837b7f515
Signed-off-by: default avatarMarek Chomnicki <marek.chomnicki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21610


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Bypass-Merge-Requirements: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 80c991f7

configure

+3 −0
Original line number Diff line number Diff line
@@ -1219,6 +1219,8 @@ if [[ "${CONFIG[ISAL]}" = "y" ]]; then 
	else

		ISAL_OPTS=()

	fi

	ISAL_CRYPTO_OPTS+=("--enable-shared=no")

	ISAL_OPTS+=("--prefix=${CONFIG[PREFIX]}")

	echo -n "Configuring ISA-L (logfile: $ISAL_LOG)..."

	./autogen.sh &> $ISAL_LOG

	./configure CFLAGS="-fPIC -g -O2" "${ISAL_OPTS[@]}" --enable-shared=no >> $ISAL_LOG 2>&1
@@ -1247,6 +1249,7 @@ if [[ "${CONFIG[ISAL]}" = "y" ]]; then 
		ISAL_CRYPTO_OPTS+=("--host=${CONFIG[CROSS_PREFIX]}")

	fi

	ISAL_CRYPTO_OPTS+=("--enable-shared=no")

	ISAL_CRYPTO_OPTS+=("--prefix=${CONFIG[PREFIX]}")

	echo -n "Configuring ISA-L-crypto (logfile: $ISAL_CRYPTO_LOG)..."

	./autogen.sh &> $ISAL_CRYPTO_LOG

	./configure CFLAGS="-fPIC -g -O2" "${ISAL_CRYPTO_OPTS[@]}" >> $ISAL_CRYPTO_LOG 2>&1

isalbuild/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ all: $(ISAL_DIR)/isa-l 
	$(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l all CC="$(SUB_CC)" $(REDIRECT)



install: all

	$(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l install $(REDIRECT)



uninstall:

	@:

	$(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l uninstall $(REDIRECT)



clean:

	$(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l clean $(REDIRECT)

isalcryptobuild/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ all: $(ISAL_CRYPTO_DIR)/isa-l-crypto 
	$(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l-crypto all CC="$(SUB_CC)" $(REDIRECT)



install: all

	$(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l-crypto install $(REDIRECT)



uninstall:

	@:

	$(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l-crypto uninstall $(REDIRECT)



clean:

	$(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l-crypto clean $(REDIRECT)

rpmbuild/spdk.spec

+5 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ rm -f %{buildroot}/usr/local/bin/dpdk-*.py 
rm -rf %{buildroot}/usr/local/share/dpdk

%endif



# The ISA-L install may have installed some binaries that we do not want to package

rm -f %{buildroot}/usr/local/bin/igzip

rm -rf %{buildroot}/usr/local/share/man



# Include libvfio-user libs in case --with-vfio-user is in use together with --with-shared

%if %{vfio_user} && %{shared}

cl %{buildroot}/usr/local/lib/libvfio-user build/libvfio-user/
@@ -168,6 +172,7 @@ SPDK static development libraries and header 
%files devel

/usr/local/include/*

%{libdir}/pkgconfig/*.pc

%{libdir}/*.la

%if %{shared}

%{libdir}/*.so*

/etc/ld.so.conf.d/spdk.conf