Commit 8130039e authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

build: don't create symlinks inside isa-l dirs 



For some reason, isa-l doesn't put its headers under isa-l directory in
its repo, but installs them that way (e.g. include/crc.h gets installed
as isa-l/crc.h).  So, to make the #includes work, we used to put a
symlink inside the isa-l repo called "isa-l" that would point to the
directory with the headers.  It worked, but caused the isa-l directory
to always show up as having untracked content in git, which is a pain.

Instead, the symlink is now moved inside the isalbuild directory and
isalbuild is added to our include paths.  All of the above also applies
to isa-l-crypto, as it used to work identically.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I22110f61b253bbdf0bbea2fbe3b533cb56d8632b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22123


Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent d965bc4d

dpdkbuild/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ DPDK_DRIVERS += compress compress/isal 
ifeq ($(CONFIG_VBDEV_COMPRESS_MLX5),y)

DPDK_DRIVERS += compress/mlx5

endif

DPDK_CFLAGS += -I$(ISAL_DIR)

DPDK_CFLAGS += -I$(ISAL_DIR) -I$(ISAL_BUILD_DIR)

DPDK_LDFLAGS += -L$(ISAL_DIR)/.libs -lisal

endif

isalbuild/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -15,10 +15,7 @@ endif 
# Force-disable scan-build

SUB_CC = $(patsubst %ccc-analyzer,$(DEFAULT_CC),$(CC))



$(ISAL_DIR)/isa-l:

	@ln -s $(ISAL_DIR)/include $(ISAL_DIR)/isa-l



all: $(ISAL_DIR)/isa-l

all:

	$(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l all CC="$(SUB_CC)" $(REDIRECT)



install: all
@@ -29,4 +26,3 @@ uninstall: 


clean:

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

isalbuild/isa-l

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../isa-l/include
 
 No newline at end of file

isalcryptobuild/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ endif 
# Force-disable scan-build

SUB_CC = $(patsubst %ccc-analyzer,$(DEFAULT_CC),$(CC))



$(ISAL_CRYPTO_DIR)/isa-l-crypto:

	@ln -s $(ISAL_CRYPTO_DIR)/include $(ISAL_CRYPTO_DIR)/isa-l-crypto



all: $(ISAL_CRYPTO_DIR)/isa-l-crypto

all:

	$(Q)$(MAKE) -C $(SPDK_ROOT_DIR)/isa-l-crypto all CC="$(SUB_CC)" $(REDIRECT)



install: all
@@ -30,4 +27,3 @@ uninstall: 


clean:

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

isalcryptobuild/isa-l-crypto

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../isa-l-crypto/include
 
 No newline at end of file