Sophie

Sophie

distrib > Mageia > 9 > armv7hl > media > core-release-src > by-pkgid > 7f7ddc51c39b5c7ea2ad72e464b2ed7a > files > 1

vboot-utils-20190823-4.mga9.src.rpm

diff -Nrup a/Makefile b/Makefile
--- a/Makefile	2019-08-26 09:30:27.000000000 +0200
+++ b/Makefile	2020-02-26 15:23:01.684385294 +0100
@@ -237,12 +237,6 @@ LD = ${CC}
 CXX ?= g++
 PKG_CONFIG ?= pkg-config
 
-# Static?
-ifneq (${STATIC},)
-LDFLAGS += -static
-PKG_CONFIG += --static
-endif
-
 # Optional Libraries
 LIBZIP_VERSION := $(shell ${PKG_CONFIG} --modversion libzip 2>/dev/null)
 HAVE_LIBZIP := $(if ${LIBZIP_VERSION},1)
@@ -953,7 +947,6 @@ ${UTILLIB}: ${UTILLIB_OBJS} ${FWLIB_OBJS
 # Link tests for external repos
 ${BUILD}/host/linktest/extern: ${HOSTLIB}
 ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB}
-${BUILD}/host/linktest/extern: LDLIBS += -static
 TEST_OBJS += ${BUILD}/host/linktest/extern.o
 
 .PHONY: hostlib
@@ -1032,9 +1025,6 @@ ${BUILD}/utility/%: INCLUDES += -Iutilit
 ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTILLIB}
 ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB}
 
-# Utilities for auto-update toolkits must be statically linked.
-${UTIL_BINS_STATIC}: LDFLAGS += -static
-
 
 .PHONY: utils
 utils: ${UTIL_BINS} ${UTIL_SCRIPTS}