From 586819755b4dbfdffdc8a725ab7c0f86095b8489 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Sep 2018 17:37:09 +0100 Subject: gentoo resync : 15.09.2018 --- ...0-led-0.2.7-Have_makefile_use_environment.patch | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch (limited to 'app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch') diff --git a/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch b/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch new file mode 100644 index 000000000000..249462bbcf0b --- /dev/null +++ b/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch @@ -0,0 +1,63 @@ +diff --git a/makefile b/makefile +index 019636d..707517d 100644 +--- a/makefile ++++ b/makefile +@@ -1,18 +1,18 @@ +-CC=g++ +-CFLAGS=-Wall -O2 -std=gnu++11 ++CXX?=g++ ++CXXFLAGS?=-Wall -O2 + LIB?=hidapi + ifeq ($(LIB),libusb) + CPPFLAGS=-Dlibusb +- LDFLAGS=-lusb-1.0 ++ LIBS=-lusb-1.0 + else + CPPFLAGS=-Dhidapi +- LDFLAGS=-lhidapi-hidraw ++ LIBS=-lhidapi-hidraw + endif + SYSTEMDDIR?=/usr/lib/systemd + +-prefix?=$(DESTDIR)/usr +-libdir?=$(prefix)/lib +-includedir?=$(prefix)/include ++PREFIX?=$(DESTDIR)/usr ++libdir?=$(PREFIX)/lib ++includedir?=$(PREFIX)/include + + # Program & versioning information + PROGN=g810-led +@@ -20,7 +20,7 @@ MAJOR=0 + MINOR=2 + MICRO=7 + +-CFLAGS+=-DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\" ++CXXFLAGS+=-std=gnu++11 -DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\" + APPSRCS=src/main.cpp src/helpers/*.cpp src/helpers/*.h + LIBSRCS=src/classes/*.cpp src/classes/*.h + +@@ -32,19 +32,19 @@ bin: bin/$(PROGN) + + bin/$(PROGN): $(APPSRCS) $(LIBSRCS) + @mkdir -p bin +- $(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) + +-debug: CFLAGS += -g -Wextra -pedantic ++debug: CXXFLAGS += -g -Wextra -pedantic + debug: bin/$(PROGN) + + lib/lib$(PROGN).so: $(LIBSRCS) + @mkdir -p lib +- $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LDFLAGS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LIBS) + @ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) lib/lib$(PROGN).so + + bin-linked: lib/lib$(PROGN).so + @mkdir -p bin +- $(CC) $(CPPFLAGS) $(CFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LDFLAGS) -L./lib -l$(PROGN) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LIBS) -L./lib -l$(PROGN) + + lib: lib/lib$(PROGN).so + -- cgit v1.2.3