Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix el5-asm-compat.patch #5

Merged
merged 1 commit into from Feb 23, 2016
Merged

fix el5-asm-compat.patch #5

merged 1 commit into from Feb 23, 2016

Conversation

jhoblitt
Copy link
Contributor

Bad migration from conda-lsst. Format was a patch-in-patch... creating
the patch is not as useful as applying it.

@jhoblitt
fix el5-asm-compat.patch
bdd6913 
Bad migration from conda-lsst.  Format was a patch-in-patch... creating
the patch is not as useful as applying it.
@jhoblitt
Copy link
Contributor Author

@timj Reopened from the same branch without any changes... spooky...

jhoblitt added a commit to jhoblitt/conda-lsst that referenced this pull request Feb 23, 2016
@jhoblitt
remove mariadb[client] patches
295e1f7 
fixed upstream:

    lsst-dm/legacy-mariadb#5
    lsst-dm/legacy-mariadbclient#5
@jhoblitt
Copy link
Contributor Author

passed http://lsst-buildx.ncsa.illinois.edu:8010/builders/DM_stack/builds/9390/steps/shell/logs/stdio

jhoblitt added a commit that referenced this pull request Feb 23, 2016
@jhoblitt
Merge pull request #5 from lsst/tickets/DM-4983-el5-compat-fixed
e949665 
fix el5-asm-compat.patch
@jhoblitt jhoblitt merged commit e949665 into master Feb 23, 2016
timj
timj reviewed Feb 24, 2016
View reviewed changes
patches/el5-asm-compat.patch
#ifdef __WIN__
#define MY_CONTEXT_USE_WIN32_FIBERS 1
-#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__)
+#elif defined(__clang__)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is an EL5 patch how come there is a clang line here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume so it doesn't break OSX. It no worky-worky on el5 without this patch applied.

@ktlim ktlim deleted the tickets/DM-4983-el5-compat-fixed branch August 25, 2018 03:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@jhoblitt @timj