haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

espeak: try to fix build for x86_gcc2 arch

Browse Source
This commit is contained in:
Gerasim Troeglazov
2022-12-21 14:39:22 +10:00
parent e92a26723f
commit 0c198c5a72
2 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app-accessibility/espeak/espeak-1.48.04.recipe
View File

@@ -10,7 +10,7 @@ which are based on human speech recordings."
HOMEPAGE="http://espeak.sourceforge.net/"
COPYRIGHT="2005-2014 Jonathan Duddington"
LICENSE="GNU GPL v3"
REVISION="5"
REVISION="6"
SOURCE_URI="http://sourceforge.net/projects/espeak/files/espeak/espeak-1.48/espeak-${portVersion}-source.zip"
CHECKSUM_SHA256="bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659"
SOURCE_DIR="espeak-${portVersion}-source"
@@ -42,14 +42,17 @@ BUILD()
{
cd src
CFLAGS=-Wno-narrowing
STDCPPLIBS=-lstdc++
if [ "$targetArchitecture" = x86_gcc2 ]; then
STDCPPLIBS=-lstdc++.r4
CFLAGS=
fi
cp -f portaudio19.h portaudio.h
make LIB_STDCPP=$STDCPPLIBS \
CXXFLAGS=$CFLAGS \
AUDIO=portaudio LIB_PTHREAD= \
VISIBILITY_FLAG= \
PREFIX=$prefix \
@@ -61,6 +64,7 @@ INSTALL()
{
cd src
make LIB_STDCPP=$STDCPPLIBS \
CXXFLAGS=$CFLAGS \
AUDIO=portaudio LIB_PTHREAD= \
VISIBILITY_FLAG= \
PREFIX=$prefix \

32
app-accessibility/espeak/patches/espeak-1.48.04.patchset
View File

@@ -57,38 +57,6 @@ index 95fe549..085fdea 100644
2.37.3
From 475eee0e45ca29ab701f7a5913d2fbe67713cefb Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 21 Dec 2022 14:20:01 +1000
Subject: Fix build
diff --git a/src/Makefile b/src/Makefile
index 085fdea..bc8d034 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -106,7 +106,7 @@ VISIBILITY_FLAG=-fvisibility=hidden
all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
.cpp.o:
- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
+ $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions -Wno-narrowing $<
$(BIN_NAME): $(OBJS1)
$(CXX) $(LDFLAGS) -o $@ $(OBJS1) $(LIBS1)
@@ -118,7 +118,7 @@ $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
x_%.o: %.cpp
$(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -fpic $(VISIBILITY_FLAG) -pedantic \
- -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o
+ -I. -D LIBRARY -c -fno-exceptions -Wno-narrowing $< -o x_$*.o
$(LIB_NAME): $(OBJS2)
$(CXX) $(LDFLAGS) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ \
--
2.37.3
From adfe8dc77b438f77fee17848ddb12b8123ba5748 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 21 Dec 2022 14:20:32 +1000