Sophie

Sophie

distrib > Mageia > 9 > armv7hl > by-pkgid > 57a12c3fb13eb7fedbaf70d8309e89af > files > 2

eddie-2.22.2-2.mga9.src.rpm

--- patch/src/App.CLI.Linux.Elevated/build.sh	2022-05-26 14:15:54.000000000 +0200
+++ patch/src/App.CLI.Linux.Elevated/build.sh.magiea-flags	2023-01-06 16:23:26.765956574 +0100
@@ -12,7 +12,7 @@ mkdir -p "$BASEPATH/bin"
 mkdir -p "$BASEPATH/obj"
 
 FILES=""
-FLAGS=""
+FLAGS="$CFLAGS"
 DEFINES=""
 CONFIG="$1"
 SHARED="yes" # See pthread_static_issue/build.sh
@@ -42,16 +42,16 @@ FILES="${FILES} $BASEPATH/obj/wireguard.
 echo "Building eddie-cli-elevated - Config: $CONFIG, Shared: $SHARED"
 
 # WireGuard functions
-gcc -c "$BASEPATH/src/wireguard.c" -o "$BASEPATH/obj/wireguard.o"
+gcc ${FLAGS} -c "$BASEPATH/src/wireguard.c" -o "$BASEPATH/obj/wireguard.o"
 
 if [ $SHARED = "yes" ]; then
-	g++ -o "$BASEPATH/bin/eddie-cli-elevated" ${FILES} -Wall -std=c++11 -O3 -pthread -lpthread ${FLAGS} -D$1 ${DEFINES}
+	g++ -o "$BASEPATH/bin/eddie-cli-elevated" ${FILES} -Wall -std=c++11 -pthread -lpthread ${FLAGS} -D$1 ${DEFINES}
 else
 	# throw segmentation fault in some distro, see pthread_static_issue/build.sh
 	g++ -o "$BASEPATH/bin/eddie-cli-elevated" ${FILES} -Wall -std=c++11 -O3 -static -pthread -Wl,--whole-archive -lpthread ${FLAGS} -Wl,--no-whole-archive -D$1 ${DEFINES}
 fi
 
-strip -S --strip-unneeded "$BASEPATH/bin/eddie-cli-elevated" 
+#strip -S --strip-unneeded --keep-file-symbols "$BASEPATH/bin/eddie-cli-elevated" 
 chmod a+x "$BASEPATH/bin/eddie-cli-elevated"
 
 echo "Building eddie-cli-elevated - Done"
--- patch2.22.2/src/Lib.Platform.Linux.Native/build.sh	2023-01-07 12:53:38.000000000 +0100
+++ patch2.22.2/src/Lib.Platform.Linux.Native/build.sh.magea-flags	2023-01-07 13:02:42.849211161 +0100
@@ -36,9 +36,9 @@ echo "Building libLib.Platform.Linux.Nat
 # Linking libcurl statically maybe a solution, but complex (a lots of .a dependencies) and require lintian override (and generally not recommended).
 # Until solution, Eddie Linux still use curl binary with shell.
 # Version 2.22.x - TOTEST
-g++ -shared -fPIC -o "$BASEPATH/bin/libLib.Platform.Linux.Native.so" "$BASEPATH/lib.cpp" -Wall -std=c++11 -O3 -lcurl -DEDDIE_LIBCURL -D$CONFIG
+g++ -shared -fPIC -o "$BASEPATH/bin/libLib.Platform.Linux.Native.so" "$BASEPATH/lib.cpp" -Wall -std=c++11 $CFLAGS -lcurl -DEDDIE_LIBCURL -D$CONFIG
 
-strip -S --strip-unneeded "$BASEPATH/bin/libLib.Platform.Linux.Native.so"
+#strip -S --strip-unneeded --keep-file-symbols "$BASEPATH/bin/libLib.Platform.Linux.Native.so"
 chmod a-x "$BASEPATH/bin/libLib.Platform.Linux.Native.so"
 
 echo "Building libLib.Platform.Linux.Native.so - Done"
--- patch/src/UI.GTK.Linux.Tray/build.sh	2022-05-26 14:15:54.000000000 +0200
+++ patch/src/UI.GTK.Linux.Tray/build.sh.mageia-flags	2023-01-06 16:24:19.629150302 +0100
@@ -21,7 +21,7 @@ mkdir -p "$BASEPATH/bin"
 mkdir -p "$BASEPATH/obj"
 
 FILES=""
-FLAGS=""
+FLAGS="$CFLAGS"
 DEFINES=""
 CONFIG="$1"
 
@@ -30,10 +30,10 @@ FILES="${FILES} $BASEPATH/src/main.cpp"
 echo "Building eddie-tray - Config: $CONFIG"
 
 echo "Building eddie-tray - If compilation errors occur, remember libayatana-appindicator3-dev package is required."
-export LDFLAGS="-Wl,-rpath=."
-g++ "$BASEPATH/main.cpp" -fPIC -o "$BASEPATH/bin/eddie-tray" `pkg-config --cflags gtk+-3.0 ayatana-appindicator3-0.1` `pkg-config --libs gtk+-3.0 ayatana-appindicator3-0.1` 
+export LDFLAGS="$LDFLAGS -Wl,-rpath=."
+g++ "$BASEPATH/main.cpp" -fPIC -o "$BASEPATH/bin/eddie-tray" `pkg-config --cflags gtk+-3.0 ayatana-appindicator3-0.1` `pkg-config --libs gtk+-3.0 ayatana-appindicator3-0.1` ${FLAGS}
 
-strip -S --strip-unneeded "$BASEPATH/bin/eddie-tray" 
+#strip -S --strip-unneeded --keep-file-symbols "$BASEPATH/bin/eddie-tray" 
 chmod a+x "$BASEPATH/bin/eddie-tray"
 patchelf --set-rpath '$ORIGIN' "$BASEPATH/bin/eddie-tray"