Loading ...
Sorry, an error occurred while loading the content.
 

Patch 7.4a.010

Expand Messages
  • Bram Moolenaar
    Patch 7.4a.010 Problem: Test 86 and 97 fail when building with Python or Python 3 and using a static library. Solution: Add configure check to add -fPIE
    Message 1 of 4 , Jul 9, 2013
      Patch 7.4a.010
      Problem: Test 86 and 97 fail when building with Python or Python 3 and
      using a static library.
      Solution: Add configure check to add -fPIE compiler flag.
      Files: src/configure.in, src/auto/configure


      *** ../vim-7.4a.009/src/configure.in 2013-07-03 19:25:28.000000000 +0200
      --- src/configure.in 2013-07-09 21:54:12.000000000 +0200
      ***************
      *** 1353,1364 ****
      --- 1353,1396 ----
      PYTHON_OBJ="objects/if_python.o"
      PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
      PYTHON_LIBS=
      + elif test "$python_ok" = yes; then
      + dnl Check that adding -fPIE works. It may be needed when using a static
      + dnl Python library.
      + AC_MSG_CHECKING([if -fPIE can be added for Python])
      + cflags_save=$CFLAGS
      + libs_save=$LIBS
      + CFLAGS="$CFLAGS $PYTHON_CFLAGS -fPIE"
      + LIBS="$LIBS $PYTHON_LIBS"
      + AC_TRY_LINK(,[ ],
      + AC_MSG_RESULT(yes); fpie_ok=yes,
      + AC_MSG_RESULT(no); fpie_ok=no)
      + CFLAGS=$cflags_save
      + LIBS=$libs_save
      + if test $fpie_ok = yes; then
      + PYTHON_CFLAGS="$PYTHON_CFLAGS -fPIE"
      + fi
      elif test "$python3_ok" = yes && test "$enable_python3interp" = "dynamic"; then
      AC_DEFINE(DYNAMIC_PYTHON3)
      PYTHON3_SRC="if_python3.c"
      PYTHON3_OBJ="objects/if_python3.o"
      PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
      PYTHON3_LIBS=
      + elif test "$python3_ok" = yes; then
      + dnl Check that adding -fPIE works. It may be needed when using a static
      + dnl Python library.
      + AC_MSG_CHECKING([if -fPIE can be added for Python3])
      + cflags_save=$CFLAGS
      + libs_save=$LIBS
      + CFLAGS="$CFLAGS $PYTHON3_CFLAGS -fPIE"
      + LIBS="$LIBS $PYTHON3_LIBS"
      + AC_TRY_LINK(,[ ],
      + AC_MSG_RESULT(yes); fpie_ok=yes,
      + AC_MSG_RESULT(no); fpie_ok=no)
      + CFLAGS=$cflags_save
      + LIBS=$libs_save
      + if test $fpie_ok = yes; then
      + PYTHON3_CFLAGS="$PYTHON3_CFLAGS -fPIE"
      + fi
      fi

      AC_MSG_CHECKING(--enable-tclinterp argument)
      *** ../vim-7.4a.009/src/auto/configure 2013-07-03 19:25:34.000000000 +0200
      --- src/auto/configure 2013-07-09 21:54:15.000000000 +0200
      ***************
      *** 5991,5996 ****
      --- 5991,6028 ----
      PYTHON_OBJ="objects/if_python.o"
      PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
      PYTHON_LIBS=
      + elif test "$python_ok" = yes; then
      + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python" >&5
      + $as_echo_n "checking if -fPIE can be added for Python... " >&6; }
      + cflags_save=$CFLAGS
      + libs_save=$LIBS
      + CFLAGS="$CFLAGS $PYTHON_CFLAGS -fPIE"
      + LIBS="$LIBS $PYTHON_LIBS"
      + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
      + /* end confdefs.h. */
      +
      + int
      + main ()
      + {
      +
      + ;
      + return 0;
      + }
      + _ACEOF
      + if ac_fn_c_try_link "$LINENO"; then :
      + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
      + $as_echo "yes" >&6; }; fpie_ok=yes
      + else
      + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
      + $as_echo "no" >&6; }; fpie_ok=no
      + fi
      + rm -f core conftest.err conftest.$ac_objext \
      + conftest$ac_exeext conftest.$ac_ext
      + CFLAGS=$cflags_save
      + LIBS=$libs_save
      + if test $fpie_ok = yes; then
      + PYTHON_CFLAGS="$PYTHON_CFLAGS -fPIE"
      + fi
      elif test "$python3_ok" = yes && test "$enable_python3interp" = "dynamic"; then
      $as_echo "#define DYNAMIC_PYTHON3 1" >>confdefs.h

      ***************
      *** 5998,6003 ****
      --- 6030,6067 ----
      PYTHON3_OBJ="objects/if_python3.o"
      PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
      PYTHON3_LIBS=
      + elif test "$python3_ok" = yes; then
      + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python3" >&5
      + $as_echo_n "checking if -fPIE can be added for Python3... " >&6; }
      + cflags_save=$CFLAGS
      + libs_save=$LIBS
      + CFLAGS="$CFLAGS $PYTHON3_CFLAGS -fPIE"
      + LIBS="$LIBS $PYTHON3_LIBS"
      + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
      + /* end confdefs.h. */
      +
      + int
      + main ()
      + {
      +
      + ;
      + return 0;
      + }
      + _ACEOF
      + if ac_fn_c_try_link "$LINENO"; then :
      + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
      + $as_echo "yes" >&6; }; fpie_ok=yes
      + else
      + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
      + $as_echo "no" >&6; }; fpie_ok=no
      + fi
      + rm -f core conftest.err conftest.$ac_objext \
      + conftest$ac_exeext conftest.$ac_ext
      + CFLAGS=$cflags_save
      + LIBS=$libs_save
      + if test $fpie_ok = yes; then
      + PYTHON3_CFLAGS="$PYTHON3_CFLAGS -fPIE"
      + fi
      fi

      { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-tclinterp argument" >&5
      *** ../vim-7.4a.009/src/version.c 2013-07-09 17:42:42.000000000 +0200
      --- src/version.c 2013-07-09 21:56:54.000000000 +0200
      ***************
      *** 729,730 ****
      --- 729,732 ----
      { /* Add new patch number below this line */
      + /**/
      + 10,
      /**/

      --
      (letter from Mark to Mike, about the film's probable certificate)
      For an 'A' we would have to: Lose as many shits as possible; Take Jesus
      Christ out, if possible; Loose "I fart in your general direction"; Lose
      "the oral sex"; Lose "oh, fuck off"; Lose "We make castanets out of your
      testicles"
      "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

      /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
      /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
      \\\ an exciting new programming language -- http://www.Zimbu.org ///
      \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

      --
      --
      You received this message from the "vim_dev" maillist.
      Do not top-post! Type your reply below the text you are replying to.
      For more information, visit http://www.vim.org/maillist.php

      ---
      You received this message because you are subscribed to the Google Groups "vim_dev" group.
      To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
      For more options, visit https://groups.google.com/groups/opt_out.
    • James McCoy
      ... test86 is still failing for me, although not as bad as before, after this patch. I get the below diff. The first hunk is because the test isn t handling
      Message 2 of 4 , Jul 11, 2013
        On Tue, Jul 09, 2013 at 09:58:06PM +0200, Bram Moolenaar wrote:
        >
        > Patch 7.4a.010
        > Problem: Test 86 and 97 fail when building with Python or Python 3 and
        > using a static library.
        > Solution: Add configure check to add -fPIE compiler flag.
        > Files: src/configure.in, src/auto/configure

        test86 is still failing for me, although not as bad as before, after
        this patch. I get the below diff. The first hunk is because the test
        isn't handling being run from a shadowdir. Not sure about the rest.

        # Check if the test.out file matches test.ok.
        437c437
        < vim-nox
        ---
        > src
        500c500
        < import failing:ImportError:('No module named failing',)
        ---
        > import failing:NotImplementedError:()
        1185a1186,1191
        > 2,xx
        > before
        > after
        > pythonx/topmodule/__init__.py
        > pythonx/topmodule/submodule/__init__.py
        > pythonx/topmodule/submodule/subsubmodule/subsubsubmodule.py

        --
        James
        GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <jamessan@...>
      • James McCoy
        ... It was all due, in various ways, to the use of a shadow build directory. Attached patch fixes the remaining issues I ve seen with building in a shadow
        Message 3 of 4 , Jul 12, 2013
          On Thu, Jul 11, 2013 at 07:28:03AM -0400, James McCoy wrote:
          > On Tue, Jul 09, 2013 at 09:58:06PM +0200, Bram Moolenaar wrote:
          > >
          > > Patch 7.4a.010
          > > Problem: Test 86 and 97 fail when building with Python or Python 3 and
          > > using a static library.
          > > Solution: Add configure check to add -fPIE compiler flag.
          > > Files: src/configure.in, src/auto/configure
          >
          > test86 is still failing for me, although not as bad as before, after
          > this patch. I get the below diff. The first hunk is because the test
          > isn't handling being run from a shadowdir. Not sure about the rest.

          It was all due, in various ways, to the use of a shadow build directory.
          Attached patch fixes the remaining issues I've seen with building in a
          shadow directory.

          Cheers,
          --
          James
          GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <jamessan@...>
        • Bram Moolenaar
          ... Thanks. It doesn t appear to change anything for when there is no shadowdir, thus it should be safe to include. -- THEOREM: VI is perfect. PROOF: VI in
          Message 4 of 4 , Jul 13, 2013
            James McCoy wrote:

            > On Thu, Jul 11, 2013 at 07:28:03AM -0400, James McCoy wrote:
            > > On Tue, Jul 09, 2013 at 09:58:06PM +0200, Bram Moolenaar wrote:
            > > >
            > > > Patch 7.4a.010
            > > > Problem: Test 86 and 97 fail when building with Python or Python 3 and
            > > > using a static library.
            > > > Solution: Add configure check to add -fPIE compiler flag.
            > > > Files: src/configure.in, src/auto/configure
            > >
            > > test86 is still failing for me, although not as bad as before, after
            > > this patch. I get the below diff. The first hunk is because the test
            > > isn't handling being run from a shadowdir. Not sure about the rest.
            >
            > It was all due, in various ways, to the use of a shadow build directory.
            > Attached patch fixes the remaining issues I've seen with building in a
            > shadow directory.

            Thanks. It doesn't appear to change anything for when there is no
            shadowdir, thus it should be safe to include.


            --
            THEOREM: VI is perfect.
            PROOF: VI in roman numerals is 6. The natural numbers < 6 which divide 6 are
            1, 2, and 3. 1+2+3 = 6. So 6 is a perfect number. Therefore, VI is perfect.
            QED
            -- Arthur Tateishi

            /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
            /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
            \\\ an exciting new programming language -- http://www.Zimbu.org ///
            \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

            --
            --
            You received this message from the "vim_dev" maillist.
            Do not top-post! Type your reply below the text you are replying to.
            For more information, visit http://www.vim.org/maillist.php

            ---
            You received this message because you are subscribed to the Google Groups "vim_dev" group.
            To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
            For more options, visit https://groups.google.com/groups/opt_out.
          Your message has been successfully submitted and would be delivered to recipients shortly.