Skip to content

Makefile: Fix build on ubuntu 16.04 with pkg-config. #626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sangjinhan merged 1 commit into from
Sep 4, 2017
Merged

Makefile: Fix build on ubuntu 16.04 with pkg-config. #626

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ else ifeq ($(words $(MAKECMDGOALS)),1)
endif

# We always want these libraries to be dynamically linked even when the
# user requests a static build. These needs to be listed first, so even
# if they're listed again in the static section, they will be dynamically
# linked.
# user requests a static build.
ALWAYS_DYN_LIBS := -lpthread -ldl
# These libraries are not supported by pkg-config.
ALWAYS_LIBS := -lpcap -lgflags
Expand Down Expand Up @@ -148,12 +146,16 @@ else # Used static libraries
LDFLAGS += -static-libstdc++
ifeq ($(HAS_PKG_CONFIG), yes)
PKG_LIBS := $(shell $(PKG_CONFIG) --static --libs $(PKG_CONFIG_DEPS))
# One of our pkg-config dependency might depend on a library that
# we want to dynamically link no matter what. Filter those out
# to avoid including them into the static linking section.
PKG_LIBS := $(filter-out $(ALWAYS_DYN_LIBS), $(PKG_LIBS))
else
PKG_LIBS := $(NO_PKG_CONFIG_LIBS) $(NO_PKG_CONFIG_LIBS_INDIRECT)
endif
endif

LIBS += $(ALWAYS_DYN_LIBS) -Wl,-non_shared \
LIBS += -Wl,-non_shared \
-Wl,--whole-archive -l$(DPDK_LIB) -Wl,--no-whole-archive \
$(LIBS_ALL_SHARED) \
$(PKG_LIBS) $(ALWAYS_LIBS) \
Expand Down