From 73dc46afc33e05b3d34d164d3467fe4a30270131 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Jan 07 2021 06:10:12 +0000 Subject: Prepare for a new update Reverting patches so we can apply the latest update and changes can be seen in the spec file and sources. --- diff --git a/lib/Makefile b/lib/Makefile index d4df300..4d99548 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -48,9 +48,6 @@ CFLAGS = -pthread -I./ -D_GNU_SOURCE \ ifneq ($(EXTRA_CFLAGS),) CFLAGS += $(EXTRA_CFLAGS) endif -ifneq ($(EXTRA_LDFLAGS),) -LDFLAGS += $(EXTRA_LDFLAGS) -endif DOXY_DIRS = doc_api doc_lib @@ -107,7 +104,7 @@ all: $(LIBNAME) $(LIBNAME): $(OBJS) ifeq ($(SHARED),y) - $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB).so.$(SO_VERSION) -o $(LIBNAME) $^ -lc + $(CC) -shared -Wl,-soname,$(LIB).so.$(SO_VERSION) -o $(LIBNAME) $^ -lc ln -f -s $(LIBNAME) $(LIB).so.$(SO_VERSION) ln -f -s $(LIB).so.$(SO_VERSION) $(LIB).so else diff --git a/pqos/Makefile b/pqos/Makefile index 0f1a26f..dc5cc1a 100644 --- a/pqos/Makefile +++ b/pqos/Makefile @@ -47,9 +47,6 @@ CFLAGS = -I$(LIBDIR) \ ifneq ($(EXTRA_CFLAGS),) CFLAGS += $(EXTRA_CFLAGS) endif -ifneq ($(EXTRA_LDFLAGS),) -LDFLAGS += $(EXTRA_LDFLAGS) -endif # ICC and GCC options ifeq ($(CC),icc) diff --git a/rdtset/Makefile b/rdtset/Makefile index d60fd53..63a752b 100644 --- a/rdtset/Makefile +++ b/rdtset/Makefile @@ -48,9 +48,6 @@ CFLAGS = -I$(LIBDIR) \ ifneq ($(EXTRA_CFLAGS),) CFLAGS += $(EXTRA_CFLAGS) endif -ifneq ($(EXTRA_LDFLAGS),) -LDFLAGS += $(EXTRA_LDFLAGS) -endif # ICC and GCC options ifeq ($(CC),icc)