aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2013-08-20 22:59:19 -0500
committerJack Nagel2013-08-20 22:59:19 -0500
commitd3bbbf967c7bafb8f4c6119cc7f0de886541a429 (patch)
tree86566d0d1fcf8f0a5e4d98d5fd8193ba50febd9e /Library
parentbc01c8f93972c5da7b09ca8daa3ec9a07fe03e70 (diff)
downloadhomebrew-d3bbbf967c7bafb8f4c6119cc7f0de886541a429.tar.bz2
libdlna: adjust patch to name dylibs correctly
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/libdlna.rb23
1 files changed, 15 insertions, 8 deletions
diff --git a/Library/Formula/libdlna.rb b/Library/Formula/libdlna.rb
index 56e212162..6a4f5cd93 100644
--- a/Library/Formula/libdlna.rb
+++ b/Library/Formula/libdlna.rb
@@ -21,34 +21,41 @@ end
__END__
diff --git a/src/Makefile b/src/Makefile
-index 3e6f704..c31f4e5 100644
+index 3e6f704..9701878 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -21,7 +21,7 @@ ifeq ($(DEVELOPER),yes)
+@@ -21,10 +21,10 @@ ifeq ($(DEVELOPER),yes)
endif
LIBNAME = libdlna
-LIBNAME_SHARED = ${LIBNAME}.so
+LIBNAME_SHARED = ${LIBNAME}.dylib
LIBNAME_STATIC = ${LIBNAME}.a
- LIBNAME_VERSION = $(LIBNAME_SHARED).$(VERSION)
- LIBNAME_MAJOR = $(LIBNAME_SHARED).$(shell echo $(VERSION) | cut -f1 -d.)
-@@ -97,8 +97,7 @@ lib_shared_info_post:
+-LIBNAME_VERSION = $(LIBNAME_SHARED).$(VERSION)
+-LIBNAME_MAJOR = $(LIBNAME_SHARED).$(shell echo $(VERSION) | cut -f1 -d.)
++LIBNAME_VERSION = $(LIBNAME).$(VERSION).dylib
++LIBNAME_MAJOR = $(LIBNAME).$(shell echo $(VERSION) | cut -f1 -d.).dylib
+
+ SRCS = profiles.c \
+ containers.c \
+@@ -97,8 +97,9 @@ lib_shared_info_post:
@echo "#############################################"
lib_shared: lib_shared_info_pre $(LOBJS) lib_shared_info_post
- $(CC) -shared -Wl,-soname,$(LIBNAME_MAJOR) $(LOBJS) \
- $(LDFLAGS) $(EXTRALIBS) -o $(LIBNAME_VERSION)
-+ $(CC) -dynamiclib -install_name $(PREFIX)/lib/$(LIBNAME_SHARED) $(LOBJS) $(LDFLAGS) $(EXTRALIBS) -o $(LIBNAME_VERSION) -compatibility_version $(VERSION) -current_version $(VERSION)
++ $(CC) -dynamiclib $(LOBJS) $(LDFLAGS) $(EXTRALIBS) -o $(LIBNAME_VERSION) \
++ -Wl,-install_name,$(PREFIX)/lib/$(LIBNAME_VERSION) \
++ -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION)
$(LN) -sf $(LIBNAME_VERSION) $(LIBNAME_MAJOR)
$(LN) -sf $(LIBNAME_MAJOR) $(LIBNAME_SHARED)
-@@ -111,7 +110,7 @@ tags:
+@@ -111,7 +112,7 @@ tags:
( find -name '*.[chS]' -print ) | xargs ctags -a;
clean:
- -$(RM) -f *.o *.lo *.a *.so*
-+ -$(RM) -f *.o *.lo *.a *.dylib*
++ -$(RM) -f *.o *.lo *.a *.dylib
-$(RM) -f .depend
install_static: lib_static