mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-11-01 15:08:21 +00:00
wine: don't build pie
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
diff --git wine-clean/configure wine-workdir/configure
|
diff --git wine-clean/configure wine-workdir/configure
|
||||||
index ed9c961..7b8413f 100755
|
index ed9c961..20d3b8a 100755
|
||||||
--- wine-clean/configure
|
--- wine-clean/configure
|
||||||
+++ wine-workdir/configure
|
+++ wine-workdir/configure
|
||||||
@@ -10219,12 +10219,14 @@ then :
|
@@ -10219,12 +10219,14 @@ then :
|
||||||
@@ -40,7 +40,82 @@ index ed9c961..7b8413f 100755
|
|||||||
ac_fn_c_check_header_compile "$LINENO" "syscall.h" "ac_cv_header_syscall_h" "$ac_includes_default"
|
ac_fn_c_check_header_compile "$LINENO" "syscall.h" "ac_cv_header_syscall_h" "$ac_includes_default"
|
||||||
if test "x$ac_cv_header_syscall_h" = xyes
|
if test "x$ac_cv_header_syscall_h" = xyes
|
||||||
then :
|
then :
|
||||||
@@ -21321,12 +21323,12 @@ then :
|
@@ -12255,6 +12257,74 @@ fi
|
||||||
|
WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs"
|
||||||
|
|
||||||
|
case $host_os in
|
||||||
|
+ astral*)
|
||||||
|
+ case $HOST_ARCH in
|
||||||
|
+ i386|arm)
|
||||||
|
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x60000000" >&5
|
||||||
|
+printf %s "checking whether the compiler supports -Wl,-Ttext-segment=0x60000000... " >&6; }
|
||||||
|
+if test ${ac_cv_cflags__Wl__Ttext_segment_0x60000000+y}
|
||||||
|
+then :
|
||||||
|
+ printf %s "(cached) " >&6
|
||||||
|
+else case e in #(
|
||||||
|
+ e) ac_wine_try_cflags_saved=$CFLAGS
|
||||||
|
+CFLAGS="$CFLAGS -Wl,-Ttext-segment=0x60000000"
|
||||||
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
+/* end confdefs.h. */
|
||||||
|
+int main(int argc, char **argv) { return 0; }
|
||||||
|
+_ACEOF
|
||||||
|
+if ac_fn_c_try_link "$LINENO"
|
||||||
|
+then :
|
||||||
|
+ ac_cv_cflags__Wl__Ttext_segment_0x60000000=yes
|
||||||
|
+else case e in #(
|
||||||
|
+ e) ac_cv_cflags__Wl__Ttext_segment_0x60000000=no ;;
|
||||||
|
+esac
|
||||||
|
+fi
|
||||||
|
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||||
|
+ conftest$ac_exeext conftest.$ac_ext
|
||||||
|
+CFLAGS=$ac_wine_try_cflags_saved ;;
|
||||||
|
+esac
|
||||||
|
+fi
|
||||||
|
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__Ttext_segment_0x60000000" >&5
|
||||||
|
+printf "%s\n" "$ac_cv_cflags__Wl__Ttext_segment_0x60000000" >&6; }
|
||||||
|
+if test "x$ac_cv_cflags__Wl__Ttext_segment_0x60000000" = xyes
|
||||||
|
+then :
|
||||||
|
+ as_fn_append WINELOADER_LDFLAGS " -Wl,-Ttext-segment=0x60000000"
|
||||||
|
+else case e in #(
|
||||||
|
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x60000400" >&5
|
||||||
|
+printf %s "checking whether the compiler supports -Wl,--section-start,.interp=0x60000400... " >&6; }
|
||||||
|
+if test ${ac_cv_cflags__Wl___section_start__interp_0x60000400+y}
|
||||||
|
+then :
|
||||||
|
+ printf %s "(cached) " >&6
|
||||||
|
+else case e in #(
|
||||||
|
+ e) ac_wine_try_cflags_saved=$CFLAGS
|
||||||
|
+CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x60000400"
|
||||||
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
+/* end confdefs.h. */
|
||||||
|
+int main(int argc, char **argv) { return 0; }
|
||||||
|
+_ACEOF
|
||||||
|
+if ac_fn_c_try_link "$LINENO"
|
||||||
|
+then :
|
||||||
|
+ ac_cv_cflags__Wl___section_start__interp_0x60000400=yes
|
||||||
|
+else case e in #(
|
||||||
|
+ e) ac_cv_cflags__Wl___section_start__interp_0x60000400=no ;;
|
||||||
|
+esac
|
||||||
|
+fi
|
||||||
|
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||||
|
+ conftest$ac_exeext conftest.$ac_ext
|
||||||
|
+CFLAGS=$ac_wine_try_cflags_saved ;;
|
||||||
|
+esac
|
||||||
|
+fi
|
||||||
|
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x60000400" >&5
|
||||||
|
+printf "%s\n" "$ac_cv_cflags__Wl___section_start__interp_0x60000400" >&6; }
|
||||||
|
+if test "x$ac_cv_cflags__Wl___section_start__interp_0x60000400" = xyes
|
||||||
|
+then :
|
||||||
|
+ as_fn_append WINELOADER_LDFLAGS " -Wl,--section-start,.interp=0x60000400"
|
||||||
|
+fi ;;
|
||||||
|
+esac
|
||||||
|
+fi
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ ;;
|
||||||
|
linux*)
|
||||||
|
as_fn_append WINELOADER_LDFLAGS " -pie"
|
||||||
|
case $HOST_ARCH in
|
||||||
|
@@ -21321,12 +21391,12 @@ then :
|
||||||
printf "%s\n" "#define HAVE_DLINFO 1" >>confdefs.h
|
printf "%s\n" "#define HAVE_DLINFO 1" >>confdefs.h
|
||||||
|
|
||||||
fi
|
fi
|
||||||
@@ -59,6 +134,11 @@ index ed9c961..7b8413f 100755
|
|||||||
ac_fn_c_check_func "$LINENO" "epoll_pwait2" "ac_cv_func_epoll_pwait2"
|
ac_fn_c_check_func "$LINENO" "epoll_pwait2" "ac_cv_func_epoll_pwait2"
|
||||||
if test "x$ac_cv_func_epoll_pwait2" = xyes
|
if test "x$ac_cv_func_epoll_pwait2" = xyes
|
||||||
then :
|
then :
|
||||||
|
@@ -25067,4 +25137,3 @@ printf "%s\n" "
|
||||||
|
$as_me: Finished. Do '${MAKE-make}' to compile Wine.
|
||||||
|
" >&6
|
||||||
|
|
||||||
|
-
|
||||||
diff --git wine-clean/dlls/nsiproxy.sys/ip.c wine-workdir/dlls/nsiproxy.sys/ip.c
|
diff --git wine-clean/dlls/nsiproxy.sys/ip.c wine-workdir/dlls/nsiproxy.sys/ip.c
|
||||||
index 2b724db..2f19151 100644
|
index 2b724db..2f19151 100644
|
||||||
--- wine-clean/dlls/nsiproxy.sys/ip.c
|
--- wine-clean/dlls/nsiproxy.sys/ip.c
|
||||||
|
|||||||
Reference in New Issue
Block a user