Ticket #258: noexecstack.diff

File noexecstack.diff, 1.5 KB (added by ivg2@…, 22 years ago)

The proposed patch

  • Makefile 

    RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.314
diff -u -r1.314 Makefile
     
    244244    ifeq ($(TARGET_WIN32),yes)
    245245        windres -o osdep/mplayer-rc.o osdep/mplayer.rc
    246246    endif
    247         $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
     247        $(CC) $(CFLAGS) -Wl,-z,noexecstack -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
    248248
    249249mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
    250250        winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
    … …  
    259259
    260260ifeq ($(MENCODER),yes)
    261261$(PRG_MENCODER): $(MENCODER_DEP)
    262         $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
     262        $(CC) $(CFLAGS) -Wl,-z,noexecstack -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
    263263endif
    264264
    265265codecs.conf.h: $(PRG_CFG) etc/codecs.conf