diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-04-10 00:39:41 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-04-10 00:39:41 +0000 |
| commit | ca1c421c71f14ae7bfb442774a2c23c88a8a39b7 (patch) | |
| tree | 41330ee2e3b8ffda9c5df836e9a00dc81b2a7197 /sys-apps/ifd-gempc/files | |
| parent | Rev bump for bug #265580. (diff) | |
| download | gentoo-2-ca1c421c71f14ae7bfb442774a2c23c88a8a39b7.tar.gz gentoo-2-ca1c421c71f14ae7bfb442774a2c23c88a8a39b7.tar.bz2 gentoo-2-ca1c421c71f14ae7bfb442774a2c23c88a8a39b7.zip | |
Version bump.
(Portage version: 13308-svn/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/ifd-gempc/files')
| -rw-r--r-- | sys-apps/ifd-gempc/files/ifd-gempc-1.0.4-respect_LDFLAGS.patch | 52 | ||||
| -rw-r--r-- | sys-apps/ifd-gempc/files/reader.conf | 2 |
2 files changed, 53 insertions, 1 deletions
diff --git a/sys-apps/ifd-gempc/files/ifd-gempc-1.0.4-respect_LDFLAGS.patch b/sys-apps/ifd-gempc/files/ifd-gempc-1.0.4-respect_LDFLAGS.patch new file mode 100644 index 000000000000..c8f2f7ad326a --- /dev/null +++ b/sys-apps/ifd-gempc/files/ifd-gempc-1.0.4-respect_LDFLAGS.patch @@ -0,0 +1,52 @@ +--- GemPC410/Makefile ++++ GemPC410/Makefile +@@ -40,7 +40,7 @@ + + libGemPC410.so: common $(targets) + rm -f $@ +- $(CC) -shared $(targets) $(common_targets) -o $@ ++ $(CC) -shared $(LDFLAGS) $(targets) $(common_targets) -o $@ + chmod -x $@ + mv $@ $@.$(version) + +--- GemPC430/Makefile ++++ GemPC430/Makefile +@@ -5,7 +5,7 @@ + # set these paths to where you installed pcsc-lite and libusb + # you can use more than one path in each variable + INCS = -I/usr/local/include `pkg-config libpcsclite --cflags` +-LIBS = -L/usr/local/lib ++LIBS = -L/usr/local/lib -lusb + INSTALL_DIR = $(DESTDIR)`pkg-config libpcsclite --variable=usbdropdir` + + # use a correct default CFLAGS +@@ -14,7 +14,6 @@ + else + CFLAGS += -Wall -fPIC -I. -I../common -DGEMPC=430 $(INCS) + endif +-LDFLAGS = $(LIBS) -lusb + + # /home/rousseau/sc/pcsc/i/ifd-gempc-0.5.10/GemPC410 -> 0.5.10 + version=$(shell expr `pwd` : '.*-\([0-9.]*\)') +@@ -27,7 +26,7 @@ + + check: check_stamp + check_stamp: +- CFLAGS="$(INCS)" LDFLAGS="$(LIBS)" ../check 430 ++ CFLAGS="$(INCS)" LIBS="$(LIBS)" ../check 430 + touch check_stamp + + expert: ifd-GemPC430 libGemPC430.so +@@ -36,10 +35,10 @@ + $(MAKE) -C ../common CFLAGS="$(CFLAGS) -I../GemPC430" all + + ifd-GemPC430: common $(targets) main.o ../common/GCdebug.o +- $(CC) $(LDFLAGS) -o $@ $(targets) $(common_targets) main.o ../common/GCdebug.o ++ $(CC) $(LDFLAGS) -o $@ $(targets) $(common_targets) main.o ../common/GCdebug.o $(LIBS) + + libGemPC430.so: common $(targets) +- $(CC) -shared $(LDFLAGS) -o $@ $(targets) $(common_targets) ++ $(CC) -shared $(LDFLAGS) -o $@ $(targets) $(common_targets) $(LIBS) + + main.o: ../GemPC410/main.c + $(CC) $(CFLAGS) -c -o $@ $^ diff --git a/sys-apps/ifd-gempc/files/reader.conf b/sys-apps/ifd-gempc/files/reader.conf index 86e99bbab795..74de4a1a60ca 100644 --- a/sys-apps/ifd-gempc/files/reader.conf +++ b/sys-apps/ifd-gempc/files/reader.conf @@ -5,7 +5,7 @@ FRIENDLYNAME "GemPC410" # Update the following to the right COM port DEVICENAME /dev/null -LIBPATH %PCSC_DRIVERS_DIR%/serial/libGemPC410.so.1.0.1 +LIBPATH %PCSC_DRIVERS_DIR%/serial/%libGemPC410% CHANNELID 1 # End of file |