diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2009-02-19 12:37:38 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2009-02-19 12:37:38 +0100 |
| commit | e3a2322b7ddb8c1f37507e0d1f7214cce2235243 (patch) | |
| tree | 0226c38d7e0aef3a0a1881fd3330e62b806eed27 | |
| parent | bbdfa08461c839c95442d585ddefd3201ec4885c (diff) | |
| download | mingw32-libusb-win32-package-e3a2322b7ddb8c1f37507e0d1f7214cce2235243.tar.gz mingw32-libusb-win32-package-e3a2322b7ddb8c1f37507e0d1f7214cce2235243.tar.xz mingw32-libusb-win32-package-e3a2322b7ddb8c1f37507e0d1f7214cce2235243.zip | |
Add patch to play around with, but ignore it
| -rw-r--r-- | GNUmakefile | 7 | ||||
| -rw-r--r-- | libusb-win32-stuff.patch | 13 | ||||
| -rw-r--r-- | mingw32-libusb-win32.spec | 4 |
3 files changed, 23 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index 28a30f8..cdaf8fb 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,3 +1,10 @@ NAME = mingw32-libusb-win32 dummy := $(shell test -f git-rpm/git-rpm.mk || git submodule update --init) include git-rpm/git-rpm.mk + +.PHONY: libusb-win32-stuff.patch +libusb-win32-stuff.patch: + if test -d libusb-win32-src-0.1.12.1 && test libusb-win32-src-0.1.12.1-stuff; then \ + diff -ru libusb-win32-src-0.1.12.1{,-stuff} > $@; \ + true; \ + fi diff --git a/libusb-win32-stuff.patch b/libusb-win32-stuff.patch new file mode 100644 index 0000000..344d219 --- /dev/null +++ b/libusb-win32-stuff.patch @@ -0,0 +1,13 @@ +diff -ru libusb-win32-src-0.1.12.1/Makefile libusb-win32-src-0.1.12.1-stuff/Makefile +--- libusb-win32-src-0.1.12.1/Makefile 2007-03-20 11:33:29.000000000 +0100 ++++ libusb-win32-src-0.1.12.1-stuff/Makefile 2009-02-18 19:05:19.000000000 +0100 +@@ -117,7 +117,7 @@ + -Wl,--kill-at \
+ -Wl,--out-implib,$(LIB_TARGET).a \
+ -Wl,--enable-stdcall-fixup \
+- -L. -lcfgmgr32 -lsetupapi
++ -L. -lsetupapi # -lcfgmgr32
+
+
+ DRIVER_LDFLAGS = -s -shared -Wl,--entry,_DriverEntry@8 \
+Only in libusb-win32-src-0.1.12.1-stuff: Makefile~ diff --git a/mingw32-libusb-win32.spec b/mingw32-libusb-win32.spec index 37dd6ae..3c8b45d 100644 --- a/mingw32-libusb-win32.spec +++ b/mingw32-libusb-win32.spec @@ -8,7 +8,7 @@ Name: mingw32-libusb-win32 Version: 0.1.12.1 -Release: 1%{?dist} +Release: 1.1%{?dist} Summary: Win32 port of libusb Group: Development/Libraries @@ -17,6 +17,7 @@ Group: Development/Libraries License: LGPLv2+ URL: http://libusb-win32.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/libusb-win32/%{tarname}-%{version}.tar.gz +Patch0: libusb-win32-stuff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mingw32-filesystem >= 30 @@ -38,6 +39,7 @@ kernel driver code. %prep %setup -q -n %{tarname}-%{version} +#patch0 -p1 -b .stuff %build |