|
Line
Link Here
|
| 0 |
-- emacs-25.1-orig/configure.ac |
0 |
++ emacs-25.1/configure.ac |
|
Lines 1140-1148
Link Here
|
| 1140 |
test $with_compress_install != yes && test -n "$GZIP_PROG" && \ |
1140 |
test $with_compress_install != yes && test -n "$GZIP_PROG" && \ |
| 1141 |
GZIP_PROG=" # $GZIP_PROG # (disabled by configure --without-compress-install)" |
1141 |
GZIP_PROG=" # $GZIP_PROG # (disabled by configure --without-compress-install)" |
| 1142 |
|
1142 |
|
| 1143 |
PAXCTL_dumped= |
|
|
| 1144 |
PAXCTL_notdumped= |
| 1145 |
if test $opsys = gnu-linux; then |
1143 |
if test $opsys = gnu-linux; then |
|
|
1144 |
AC_PATH_PROG(PAXCTL, paxctl,, |
| 1145 |
[$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin]) |
| 1146 |
if test "X$PAXCTL" != X; then |
| 1147 |
AC_MSG_CHECKING([whether binaries have a PT_PAX_FLAGS header]) |
| 1148 |
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], |
| 1149 |
[if $PAXCTL -v conftest$EXEEXT >/dev/null 2>&1; then AC_MSG_RESULT(yes) |
| 1150 |
else AC_MSG_RESULT(no); PAXCTL=""; fi]) |
| 1151 |
fi |
| 1152 |
|
| 1146 |
if test "${SETFATTR+set}" != set; then |
1153 |
if test "${SETFATTR+set}" != set; then |
| 1147 |
AC_CACHE_CHECK([for setfattr], |
1154 |
AC_CACHE_CHECK([for setfattr], |
| 1148 |
[emacs_cv_prog_setfattr], |
1155 |
[emacs_cv_prog_setfattr], |
|
Lines 1153-1159
Link Here
|
| 1153 |
emacs_cv_prog_setfattr=no |
1160 |
emacs_cv_prog_setfattr=no |
| 1154 |
fi]) |
1161 |
fi]) |
| 1155 |
if test "$emacs_cv_prog_setfattr" = yes; then |
1162 |
if test "$emacs_cv_prog_setfattr" = yes; then |
| 1156 |
PAXCTL_notdumped='$(SETFATTR) -n user.pax.flags -v er' |
|
|
| 1157 |
SETFATTR=setfattr |
1163 |
SETFATTR=setfattr |
| 1158 |
else |
1164 |
else |
| 1159 |
SETFATTR= |
1165 |
SETFATTR= |
|
Lines 1162-1193
Link Here
|
| 1162 |
AC_SUBST([SETFATTR]) |
1168 |
AC_SUBST([SETFATTR]) |
| 1163 |
fi |
1169 |
fi |
| 1164 |
fi |
1170 |
fi |
| 1165 |
case $opsys,$PAXCTL_notdumped in |
|
|
| 1166 |
gnu-linux, | netbsd,) |
| 1167 |
AC_PATH_PROG([PAXCTL], [paxctl], [], |
| 1168 |
[$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin]) |
| 1169 |
if test -n "$PAXCTL"; then |
| 1170 |
if test "$opsys" = netbsd; then |
| 1171 |
PAXCTL_dumped='$(PAXCTL) +a' |
| 1172 |
PAXCTL_notdumped=$PAXCTL_dumped |
| 1173 |
else |
| 1174 |
AC_MSG_CHECKING([whether binaries have a PT_PAX_FLAGS header]) |
| 1175 |
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], |
| 1176 |
[if $PAXCTL -v conftest$EXEEXT >/dev/null 2>&1; then |
| 1177 |
AC_MSG_RESULT([yes]) |
| 1178 |
else |
| 1179 |
AC_MSG_RESULT([no]) |
| 1180 |
PAXCTL= |
| 1181 |
fi]) |
| 1182 |
if test -n "$PAXCTL"; then |
| 1183 |
PAXCTL_dumped='$(PAXCTL) -zex' |
| 1184 |
PAXCTL_notdumped='$(PAXCTL) -r' |
| 1185 |
fi |
| 1186 |
fi |
| 1187 |
fi;; |
| 1188 |
esac |
| 1189 |
AC_SUBST([PAXCTL_dumped]) |
| 1190 |
AC_SUBST([PAXCTL_notdumped]) |
| 1191 |
|
1171 |
|
| 1192 |
## Need makeinfo >= 4.7 (?) to build the manuals. |
1172 |
## Need makeinfo >= 4.7 (?) to build the manuals. |
| 1193 |
if test "$MAKEINFO" != "no"; then |
1173 |
if test "$MAKEINFO" != "no"; then |
| 1194 |
-- emacs-25.1-orig/src/Makefile.in |
1174 |
++ emacs-25.1/src/Makefile.in |
|
Lines 114-122
Link Here
|
| 114 |
## around this, newer ones setfattr. See Bug#11398 and Bug#16343. |
114 |
## around this, newer ones setfattr. See Bug#11398 and Bug#16343. |
| 115 |
PAXCTL = @PAXCTL@ |
115 |
PAXCTL = @PAXCTL@ |
| 116 |
SETFATTR = @SETFATTR@ |
116 |
SETFATTR = @SETFATTR@ |
| 117 |
## Commands to set PaX flags on dumped and not-dumped instances of Emacs. |
117 |
PAXCTL_if_present = $(or $(PAXCTL),: paxctl) |
| 118 |
PAXCTL_dumped = @PAXCTL_dumped@ |
118 |
SETFATTR_if_present = $(or $(SETFATTR),: setfattr) |
| 119 |
PAXCTL_notdumped = @PAXCTL_notdumped@ |
|
|
| 120 |
|
119 |
|
| 121 |
## Some systems define this to request special libraries. |
120 |
## Some systems define this to request special libraries. |
| 122 |
LIBS_SYSTEM=@LIBS_SYSTEM@ |
121 |
LIBS_SYSTEM=@LIBS_SYSTEM@ |
|
Lines 533-541
Link Here
|
| 533 |
ln -f temacs$(EXEEXT) $@ |
532 |
ln -f temacs$(EXEEXT) $@ |
| 534 |
else |
533 |
else |
| 535 |
LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump |
534 |
LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump |
| 536 |
ifneq ($(PAXCTL_dumped),) |
535 |
$(PAXCTL_if_present) -zex $@ |
| 537 |
$(PAXCTL_dumped) $@ |
|
|
| 538 |
endif |
| 539 |
ln -f $@ bootstrap-emacs$(EXEEXT) |
536 |
ln -f $@ bootstrap-emacs$(EXEEXT) |
| 540 |
endif |
537 |
endif |
| 541 |
|
538 |
|
|
Lines 597-605
Link Here
|
| 597 |
-o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES) |
594 |
-o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES) |
| 598 |
$(MKDIR_P) $(etc) |
595 |
$(MKDIR_P) $(etc) |
| 599 |
ifneq ($(CANNOT_DUMP),yes) |
596 |
ifneq ($(CANNOT_DUMP),yes) |
| 600 |
ifneq ($(PAXCTL_notdumped),) |
597 |
$(PAXCTL_if_present) -r $@ |
| 601 |
$(PAXCTL_notdumped) $@ |
598 |
$(SETFATTR_if_present) -n user.pax.flags -v er $@ |
| 602 |
endif |
|
|
| 603 |
endif |
599 |
endif |
| 604 |
|
600 |
|
| 605 |
## The following oldxmenu-related rules are only (possibly) used if |
601 |
## The following oldxmenu-related rules are only (possibly) used if |
|
Lines 738-746
Link Here
|
| 738 |
ln -f temacs$(EXEEXT) $@ |
734 |
ln -f temacs$(EXEEXT) $@ |
| 739 |
else |
735 |
else |
| 740 |
$(RUN_TEMACS) --batch --load loadup bootstrap |
736 |
$(RUN_TEMACS) --batch --load loadup bootstrap |
| 741 |
ifneq ($(PAXCTL_dumped),) |
737 |
$(PAXCTL_if_present) -zex emacs$(EXEEXT) |
| 742 |
$(PAXCTL_dumped) emacs$(EXEEXT) |
|
|
| 743 |
endif |
| 744 |
mv -f emacs$(EXEEXT) $@ |
738 |
mv -f emacs$(EXEEXT) $@ |
| 745 |
endif |
739 |
endif |
| 746 |
@: Compile some files earlier to speed up further compilation. |
740 |
@: Compile some files earlier to speed up further compilation. |
