File wrk-3.1.2_distrofixes.patch of Package wrk
Index: Makefile =================================================================== --- Makefile.orig +++ Makefile @@ -1,5 +1,5 @@ -CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT -LIBS := -lpthread -lm -lssl -lcrypto +CFLAGS += -std=c99 -Wall -O2 -D_REENTRANT $(OPTFLAGS) $(shell pkg-config --cflags openssl luajit) +LIBS := -lpthread -lm $(shell pkg-config --libs openssl luajit) TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) @@ -9,7 +9,7 @@ ifeq ($(TARGET), sunos) else ifeq ($(TARGET), darwin) LDFLAGS += -pagezero_size 10000 -image_base 100000000 else ifeq ($(TARGET), linux) - CFLAGS += -D_POSIX_C_SOURCE=200112L -D_BSD_SOURCE -D_DEFAULT_SOURCE + CFLAGS += -D_POSIX_C_SOURCE=200112L -D_BSD_SOURCE -D_DEFAULT_SOURCE $(OPTFLAGS) LIBS += -ldl LDFLAGS += -Wl,-E else ifeq ($(TARGET), freebsd) @@ -27,23 +27,23 @@ OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC LIBS := -lluajit-5.1 $(LIBS) DEPS := -CFLAGS += -I$(ODIR)/include -LDFLAGS += -L$(ODIR)/lib +#CFLAGS += -I$(ODIR)/include +#LDFLAGS += -L$(ODIR)/lib -ifneq ($(WITH_LUAJIT),) - CFLAGS += -I$(WITH_LUAJIT)/include - LDFLAGS += -L$(WITH_LUAJIT)/lib -else - CFLAGS += -I$(ODIR)/include/luajit-2.1 - DEPS += $(ODIR)/lib/libluajit-5.1.a -endif - -ifneq ($(WITH_OPENSSL),) - CFLAGS += -I$(WITH_OPENSSL)/include - LDFLAGS += -L$(WITH_OPENSSL)/lib -else - DEPS += $(ODIR)/lib/libssl.a -endif +# ifneq ($(WITH_LUAJIT),) +# CFLAGS += -I$(WITH_LUAJIT)/include +# LDFLAGS += -L$(WITH_LUAJIT)/lib +# else +# CFLAGS += -I$(ODIR)/include/luajit-2.1 +# DEPS += $(ODIR)/lib/libluajit-5.1.a +# endif +# +# ifneq ($(WITH_OPENSSL),) +# CFLAGS += -I$(WITH_OPENSSL)/include +# LDFLAGS += -L$(WITH_OPENSSL)/lib +# else +# DEPS += $(ODIR)/lib/libssl.a +# endif all: $(BIN) @@ -67,8 +67,7 @@ $(ODIR)/version.o: @echo 'const char *VERSION="$(VER)";' | $(CC) -xc -c -o $@ - $(ODIR)/%.o : %.c - @echo CC $< - @$(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< # Dependencies