mirror of
https://github.com/Ponce/slackbuilds
synced 2024-12-02 13:04:42 +01:00
36 lines
1.9 KiB
Diff
36 lines
1.9 KiB
Diff
diff -Naur flite-2.0.0-release/config/common_make_rules flite-2.0.0-release.new/config/common_make_rules
|
|
--- flite-2.0.0-release/config/common_make_rules 2012-01-15 07:06:52.000000000 -0800
|
|
+++ flite-2.0.0-release.new/config/common_make_rules 2017-06-14 00:41:06.080962503 -0700
|
|
@@ -68,7 +68,7 @@
|
|
|
|
FLITELIBS = $(BUILDDIR)/lib/libflite.a
|
|
FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite
|
|
-LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS)
|
|
+LDLIBS += -lm $(AUDIOLIBS) $(OTHERLIBS)
|
|
|
|
FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
|
|
ifdef SHFLAGS
|
|
@@ -123,7 +123,7 @@
|
|
@ rm -rf shared_os && mkdir shared_os
|
|
@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
|
|
@ (cd shared_os && ar x ../$<)
|
|
- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
|
|
+ @ (cd shared_os && $(CC) ${LDFLAGS} -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDLIBS))
|
|
@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
|
|
@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
|
|
@ rm -rf shared_os
|
|
diff -Naur flite-2.0.0-release/tools/Makefile flite-2.0.0-release.new/tools/Makefile
|
|
--- flite-2.0.0-release/tools/Makefile 2014-08-22 06:06:18.000000000 -0700
|
|
+++ flite-2.0.0-release.new/tools/Makefile 2017-06-14 00:23:10.081062041 -0700
|
|
@@ -67,9 +67,9 @@
|
|
LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort $(TOP)/bin
|
|
|
|
$(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS)
|
|
- $(CC) $(CFLAGS) -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDFLAGS)
|
|
+ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDLIBS)
|
|
$(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS)
|
|
- $(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS)
|
|
+ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDLIBS)
|
|
makescripts:
|
|
@ cp -p $(SCRIPTS) $(TOP)/bin
|
|
|