diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-15 12:02:28 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-15 12:02:28 +0000 |
| commit | bdd049c2a4985c7a4ced3429419ccb4de0bd054d (patch) | |
| tree | 219234cd428cc42e43254a54b91fc22c17e85e7e /audio/libnoise/files/patch-src_Makefile | |
| parent | Fix build error with INLINE_IMAGE option. (diff) | |
- Fix libtool use (add -rpath)
- Use COPYTREE_SHARE to install include headers
- Add dos2unix so the patch can have svn:eol-style native
Notes
Notes:
svn path=/head/; revision=368262
Diffstat (limited to 'audio/libnoise/files/patch-src_Makefile')
| -rw-r--r-- | audio/libnoise/files/patch-src_Makefile | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/audio/libnoise/files/patch-src_Makefile b/audio/libnoise/files/patch-src_Makefile index 6bf567fbb7d4..5ab2fdcd73e3 100644 --- a/audio/libnoise/files/patch-src_Makefile +++ b/audio/libnoise/files/patch-src_Makefile @@ -1,19 +1,22 @@ ---- src/Makefile.orig 2004-10-24 21:21:12.000000000 +0200 -+++ src/Makefile 2009-07-16 11:31:48.000000000 +0200 -@@ -12,12 +12,12 @@ -
- # hooks for future makefiles being able to make multiple SOs, or older SOs
- libnoise: libnoise.so libnoise.a libnoise.la
--libnoise.so: libnoise.so.0
--libnoise.so.0: libnoise.so.0.3
-+#libnoise.so: libnoise.so.0
-+#libnoise.so.0: libnoise.so.0.3
-
- # Real build targets
--libnoise.so.0.3: $(OBJECTS)
-- $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -shared -Wl,-soname=libnoise.so.0 -o $@ $(OBJECTS:.o=.lo)
-+libnoise: $(OBJECTS)
-+ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -shared -o $@.la $(OBJECTS:.o=.lo) -rpath %%LOCALBASE%%/lib
-
- libnoise.a: $(OBJECTS)
- $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS)
+--- src/Makefile.orig 2014-09-15 11:57:34 UTC ++++ src/Makefile +@@ -11,7 +11,7 @@ + .PHONY: all clean cleandeps cleanobjs cleanlib libnoise libnoise.so libnoise.so.0 + + # hooks for future makefiles being able to make multiple SOs, or older SOs +-libnoise: libnoise.so libnoise.a libnoise.la ++libnoise: libnoise.la + libnoise.so: libnoise.so.0 + libnoise.so.0: libnoise.so.0.3 + +@@ -21,8 +21,8 @@ + + libnoise.a: $(OBJECTS) + $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS) +-libnoise.la: $(OBJECTS) +- $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo) ++libnoise.la: $(OBJECTS:.o=.lo) ++ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/lib -o $@ $(OBJECTS:.o=.lo) + + clean: cleandeps cleanobjs cleanlib + cleandeps: |