Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (44b23c9cc8dfb203bd4a956c5f08db56fce8dbed)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: Thomas Orgis <sobukus AT sourcemage.org>
  • Cc: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (44b23c9cc8dfb203bd4a956c5f08db56fce8dbed)
  • Date: Sat, 24 Jun 2006 09:39:59 +0200

On Fri, Jun 23, 2006 at 10:37:31PM -0500, Thomas Orgis wrote:
> GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
>
> video/mjpegtools/BUILD | 6 +++++-
> video/mjpegtools/HISTORY | 5 +++++
> 2 files changed, 10 insertions(+), 1 deletion(-)
>
> New commits:
> commit 44b23c9cc8dfb203bd4a956c5f08db56fce8dbed
> Merge: a62e374015b12c8b2dd4383803b60e7c3a6deb77
> 22b3f59a85689dea1513ba73845f993ad4e654d4
> Author: Thomas Orgis <sobukus AT sourcemage.org>
> Commit: Thomas Orgis <sobukus AT sourcemage.org>
>
> Merge branch 'master' of ssh://thorgis AT scm.sourcemage.org/smgl/grimoire
>
> commit a62e374015b12c8b2dd4383803b60e7c3a6deb77
> Author: Thomas Orgis <sobukus AT sourcemage.org>
> Commit: Thomas Orgis <sobukus AT sourcemage.org>
>
> no disable_pic for alpha (avoid confusion, alpha always wants PIC)

Does alpha _always_ use PIC, or only for this spell? If it always does,
it should be added to the exclude list in disable_pic like amd64 is.

> diff --git a/video/mjpegtools/BUILD b/video/mjpegtools/BUILD
> index 7832c31..b6b6bb2 100755
> --- a/video/mjpegtools/BUILD
> +++ b/video/mjpegtools/BUILD
> @@ -4,7 +4,11 @@ sedit 's/ARCHFLAGS="-mcpu=i686 -march=$
> sedit 's/ARCHFLAGS="-mcpu=i586 -march=$arch"/ARCHFLAGS=""/' configure &&
>
> # fails to compile with -DPIC and -fPIC except on AMD64
> -disable_pic &&
> +# ...and Alpha; where mjpegtools configure sets PIC anyway - disabling
> +# here doesn't hurt but doesn't make sense, either.
> +if [[ ${SMGL_COMPAT_ARCHS[1]} != alpha ]]; then
> + disable_pic
> +fi &&
>
> OPTS="--without-libquicktime $OPTS" &&
> make_single &&
> diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
> index 86c83d6..cdd9eaa 100644
> --- a/video/mjpegtools/HISTORY
> +++ b/video/mjpegtools/HISTORY
> @@ -1,3 +1,8 @@
> +2006-06-24 Thomas Orgis <sobukus AT sourcemage.org>
> + * BUILD: disabled disable_pic for alpha, where is is actually
> + a no-op (configure enables PIC) - just to make clear that
> + PIC is no prob there
> +
> 2006-04-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx:
> * BUILD: replaced fPIC and DPIC removal code with disable_pic
>

> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit


--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org




Archive powered by MHonArc 2.6.24.

Top of Page